| Message ID | 1464973802-9286-2-git-send-email-ricardo.ribalda@gmail.com |
|---|---|
| State | New |
| Headers | show |
On Fri, Jun 3, 2016 at 7:10 PM, Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> wrote: > gpiolib relies on the reference counters to clean up the gpio_device > structure. > > Although the number of get/put is properly aligned on gpiolib.c > itself, it does not take into consideration how the referece counters > are affected by other external functions such as cdev_add and device_add. > > Because of this, after the last call to put_device, the reference counter > has a value of +3, therefore never calling gpiodevice_release. > > Due to the fact that some of the device has already been cleaned on > gpiochip_remove, the library will end up OOPsing the kernel (e.g. a call > to of_gpiochip_find_and_xlate). > > Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> Again, thanks for fixing my stupid mistakes. Applied and tagged for stable. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 0626cc96744b..d829f2127524 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -438,7 +438,6 @@ static void gpiodevice_release(struct device *dev) { struct gpio_device *gdev = dev_get_drvdata(dev); - cdev_del(&gdev->chrdev); list_del(&gdev->list); ida_simple_remove(&gpio_ida, gdev->id); kfree(gdev->label); @@ -471,7 +470,6 @@ static int gpiochip_setup_dev(struct gpio_device *gdev) /* From this point, the .release() function cleans up gpio_device */ gdev->dev.release = gpiodevice_release; - get_device(&gdev->dev); pr_debug("%s: registered GPIOs %d to %d on device: %s (%s)\n", __func__, gdev->base, gdev->base + gdev->ngpio - 1, dev_name(&gdev->dev), gdev->chip->label ? : "generic"); @@ -759,6 +757,8 @@ void gpiochip_remove(struct gpio_chip *chip) * be removed, else it will be dangling until the last user is * gone. */ + cdev_del(&gdev->chrdev); + device_del(&gdev->dev); put_device(&gdev->dev); } EXPORT_SYMBOL_GPL(gpiochip_remove);
gpiolib relies on the reference counters to clean up the gpio_device structure. Although the number of get/put is properly aligned on gpiolib.c itself, it does not take into consideration how the referece counters are affected by other external functions such as cdev_add and device_add. Because of this, after the last call to put_device, the reference counter has a value of +3, therefore never calling gpiodevice_release. Due to the fact that some of the device has already been cleaned on gpiochip_remove, the library will end up OOPsing the kernel (e.g. a call to of_gpiochip_find_and_xlate). Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> --- We might want to cc: stable on these two patches drivers/gpio/gpiolib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)