Commit 9cd053c7 authored by Johan Hovold's avatar Johan Hovold Committed by Luis Henriques

gpio: sysfs: fix gpio device-attribute leak

commit 0915e6fe upstream.

The gpio device attributes were never destroyed when the gpio was
unexported (or on export failures).

Use device_create_with_groups() to create the default device attributes
of the gpio class device. Note that this also fixes the
attribute-creation race with userspace for these attributes.

Remove contingent attributes in export error path and on unexport.

Fixes: d8f388d8 ("gpio: sysfs interface")
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
[ luis: backported to 3.16:
  - file rename: drivers/gpio/gpiolib-sysfs.c -> drivers/gpio/gpiolib.c ]
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent b3ab45dc
...@@ -409,7 +409,7 @@ static ssize_t gpio_value_store(struct device *dev, ...@@ -409,7 +409,7 @@ static ssize_t gpio_value_store(struct device *dev,
return status; return status;
} }
static const DEVICE_ATTR(value, 0644, static DEVICE_ATTR(value, 0644,
gpio_value_show, gpio_value_store); gpio_value_show, gpio_value_store);
static irqreturn_t gpio_sysfs_irq(int irq, void *priv) static irqreturn_t gpio_sysfs_irq(int irq, void *priv)
...@@ -634,18 +634,15 @@ static ssize_t gpio_active_low_store(struct device *dev, ...@@ -634,18 +634,15 @@ static ssize_t gpio_active_low_store(struct device *dev,
return status ? : size; return status ? : size;
} }
static const DEVICE_ATTR(active_low, 0644, static DEVICE_ATTR(active_low, 0644,
gpio_active_low_show, gpio_active_low_store); gpio_active_low_show, gpio_active_low_store);
static const struct attribute *gpio_attrs[] = { static struct attribute *gpio_attrs[] = {
&dev_attr_value.attr, &dev_attr_value.attr,
&dev_attr_active_low.attr, &dev_attr_active_low.attr,
NULL, NULL,
}; };
ATTRIBUTE_GROUPS(gpio);
static const struct attribute_group gpio_attr_group = {
.attrs = (struct attribute **) gpio_attrs,
};
/* /*
* /sys/class/gpio/gpiochipN/ * /sys/class/gpio/gpiochipN/
...@@ -842,18 +839,15 @@ int gpiod_export(struct gpio_desc *desc, bool direction_may_change) ...@@ -842,18 +839,15 @@ int gpiod_export(struct gpio_desc *desc, bool direction_may_change)
if (desc->chip->names && desc->chip->names[offset]) if (desc->chip->names && desc->chip->names[offset])
ioname = desc->chip->names[offset]; ioname = desc->chip->names[offset];
dev = device_create(&gpio_class, desc->chip->dev, MKDEV(0, 0), dev = device_create_with_groups(&gpio_class, desc->chip->dev,
desc, ioname ? ioname : "gpio%u", MKDEV(0, 0), desc, gpio_groups,
desc_to_gpio(desc)); ioname ? ioname : "gpio%u",
desc_to_gpio(desc));
if (IS_ERR(dev)) { if (IS_ERR(dev)) {
status = PTR_ERR(dev); status = PTR_ERR(dev);
goto fail_unlock; goto fail_unlock;
} }
status = sysfs_create_group(&dev->kobj, &gpio_attr_group);
if (status)
goto fail_unregister_device;
if (direction_may_change) { if (direction_may_change) {
status = device_create_file(dev, &dev_attr_direction); status = device_create_file(dev, &dev_attr_direction);
if (status) if (status)
...@@ -864,13 +858,15 @@ int gpiod_export(struct gpio_desc *desc, bool direction_may_change) ...@@ -864,13 +858,15 @@ int gpiod_export(struct gpio_desc *desc, bool direction_may_change)
!test_bit(FLAG_IS_OUT, &desc->flags))) { !test_bit(FLAG_IS_OUT, &desc->flags))) {
status = device_create_file(dev, &dev_attr_edge); status = device_create_file(dev, &dev_attr_edge);
if (status) if (status)
goto fail_unregister_device; goto fail_remove_attr_direction;
} }
set_bit(FLAG_EXPORT, &desc->flags); set_bit(FLAG_EXPORT, &desc->flags);
mutex_unlock(&sysfs_lock); mutex_unlock(&sysfs_lock);
return 0; return 0;
fail_remove_attr_direction:
device_remove_file(dev, &dev_attr_direction);
fail_unregister_device: fail_unregister_device:
device_unregister(dev); device_unregister(dev);
fail_unlock: fail_unlock:
...@@ -1004,6 +1000,8 @@ void gpiod_unexport(struct gpio_desc *desc) ...@@ -1004,6 +1000,8 @@ void gpiod_unexport(struct gpio_desc *desc)
mutex_unlock(&sysfs_lock); mutex_unlock(&sysfs_lock);
if (dev) { if (dev) {
device_remove_file(dev, &dev_attr_edge);
device_remove_file(dev, &dev_attr_direction);
device_unregister(dev); device_unregister(dev);
put_device(dev); put_device(dev);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment