lkml.org 
[lkml]   [2015]   [Jan]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 139/176] gpio: sysfs: fix gpio-chip device-attribute leak
    Date
    From: Johan Hovold <johan@kernel.org>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    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: Jiri Slaby <jslaby@suse.cz>
    ---
    drivers/gpio/gpiolib.c | 19 ++++++++-----------
    1 file changed, 8 insertions(+), 11 deletions(-)

    diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
    index aed1a6216b6b..b5d0fff2cd5a 100644
    --- a/drivers/gpio/gpiolib.c
    +++ b/drivers/gpio/gpiolib.c
    @@ -627,16 +627,13 @@ static ssize_t chip_ngpio_show(struct device *dev,
    }
    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,
    NULL,
    };
    -
    -static const struct attribute_group gpiochip_attr_group = {
    - .attrs = (struct attribute **) gpiochip_attrs,
    -};
    +ATTRIBUTE_GROUPS(gpiochip);

    /*
    * /sys/class/gpio/export ... write-only
    @@ -1001,13 +998,13 @@ static int gpiochip_export(struct gpio_chip *chip)

    /* use chip->base for the ID; it's already known to be unique */
    mutex_lock(&sysfs_lock);
    - dev = device_create(&gpio_class, chip->dev, MKDEV(0, 0), chip,
    - "gpiochip%d", chip->base);
    - if (!IS_ERR(dev)) {
    - status = sysfs_create_group(&dev->kobj,
    - &gpiochip_attr_group);
    - } else
    + dev = device_create_with_groups(&gpio_class, chip->dev, MKDEV(0, 0),
    + chip, gpiochip_groups,
    + "gpiochip%d", chip->base);
    + if (IS_ERR(dev))
    status = PTR_ERR(dev);
    + else
    + status = 0;
    chip->exported = (status == 0);
    mutex_unlock(&sysfs_lock);

    --
    2.2.2


    \
     
     \ /
      Last update: 2015-01-29 11:41    [W:5.876 / U:0.252 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site