gpio: sysfs: release irq after class-device deregistration
Make sure to release any irq only after the class device has been deregistered. This avoids a race between gpiod_unexport and edge_store, where an irq could be allocated just before the gpio class device is deregistered without relying on FLAG_EXPORT and the global sysfs lock. Note that there is no need to hold the sysfs lock when releasing the irq after the class device is gone as kernfs will prevent further attribute operations. Signed-off-by: Johan Hovold <johan@kernel.org> Reviewed-by: Alexandre Courbot <acourbot@nvidia.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
parent
6beac9d1aa
commit
54d9acd754
|
@ -695,7 +695,6 @@ void gpiod_unexport(struct gpio_desc *desc)
|
||||||
|
|
||||||
dev = class_find_device(&gpio_class, NULL, desc, match_export);
|
dev = class_find_device(&gpio_class, NULL, desc, match_export);
|
||||||
if (dev) {
|
if (dev) {
|
||||||
gpio_setup_irq(desc, dev, 0);
|
|
||||||
clear_bit(FLAG_SYSFS_DIR, &desc->flags);
|
clear_bit(FLAG_SYSFS_DIR, &desc->flags);
|
||||||
clear_bit(FLAG_EXPORT, &desc->flags);
|
clear_bit(FLAG_EXPORT, &desc->flags);
|
||||||
} else
|
} else
|
||||||
|
@ -706,6 +705,11 @@ void gpiod_unexport(struct gpio_desc *desc)
|
||||||
|
|
||||||
if (dev) {
|
if (dev) {
|
||||||
device_unregister(dev);
|
device_unregister(dev);
|
||||||
|
/*
|
||||||
|
* Release irq after deregistration to prevent race with
|
||||||
|
* edge_store.
|
||||||
|
*/
|
||||||
|
gpio_setup_irq(desc, dev, 0);
|
||||||
put_device(dev);
|
put_device(dev);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue