| From 121b6a79955a3a3fd7bbb9b8cb88d5b9dad6283d Mon Sep 17 00:00:00 2001 |
| From: Johan Hovold <johan@kernel.org> |
| Date: Tue, 13 Jan 2015 13:00:04 +0100 |
| Subject: gpio: sysfs: fix gpio-chip device-attribute leak |
| |
| From: Johan Hovold <johan@kernel.org> |
| |
| commit 121b6a79955a3a3fd7bbb9b8cb88d5b9dad6283d upstream. |
| |
| The gpio-chip device attributes were never destroyed when the device was |
| removed. |
| |
| Fix by using device_create_with_groups() to create the device attributes |
| of the chip class device. |
| |
| Note that this also fixes the attribute-creation race with userspace. |
| |
| Fixes: d8f388d8dc8d ("gpio: sysfs interface") |
| Signed-off-by: Johan Hovold <johan@kernel.org> |
| Signed-off-by: Linus Walleij <linus.walleij@linaro.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| |
| |
| --- |
| drivers/gpio/gpiolib.c | 5 +++-- |
| 1 file changed, 3 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/gpio/gpiolib.c |
| +++ b/drivers/gpio/gpiolib.c |
| @@ -627,7 +627,7 @@ static ssize_t chip_ngpio_show(struct de |
| } |
| static DEVICE_ATTR(ngpio, 0444, chip_ngpio_show, NULL); |
| |
| -static const struct attribute *gpiochip_attrs[] = { |
| +static struct attribute *gpiochip_attrs[] = { |
| &dev_attr_base.attr, |
| &dev_attr_label.attr, |
| &dev_attr_ngpio.attr, |
| @@ -635,7 +635,7 @@ static const struct attribute *gpiochip_ |
| }; |
| |
| static const struct attribute_group gpiochip_attr_group = { |
| - .attrs = (struct attribute **) gpiochip_attrs, |
| + .attrs = gpiochip_attrs, |
| }; |
| |
| /* |
| @@ -1036,6 +1036,7 @@ static void gpiochip_unexport(struct gpi |
| mutex_lock(&sysfs_lock); |
| dev = class_find_device(&gpio_class, NULL, chip, match_export); |
| if (dev) { |
| + sysfs_remove_group(&dev->kobj, &gpiochip_attr_group); |
| put_device(dev); |
| device_unregister(dev); |
| chip->exported = 0; |
