]> git.baikalelectronics.ru Git - kernel.git/commitdiff
powerpc/ibmebus: Fix device reference leaks in sysfs interface
authorJohan Hovold <johan@kernel.org>
Tue, 1 Nov 2016 15:26:00 +0000 (16:26 +0100)
committerMichael Ellerman <mpe@ellerman.id.au>
Mon, 14 Nov 2016 09:05:58 +0000 (20:05 +1100)
Make sure to drop any reference taken by bus_find_device() in the sysfs
callbacks that are used to create and destroy devices based on
device-tree entries.

Fixes: 6de1b367104f ("[POWERPC] ibmebus: dynamic addition/removal of adapters, some code cleanup")
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/kernel/ibmebus.c

index 6ca9a2ffaac72d38b20202b6c6e845c39541608f..c7d3ff7e101cec5113f6c524322eccac2d1a3d0e 100644 (file)
@@ -262,6 +262,7 @@ static ssize_t ibmebus_store_probe(struct bus_type *bus,
                                   const char *buf, size_t count)
 {
        struct device_node *dn = NULL;
+       struct device *dev;
        char *path;
        ssize_t rc = 0;
 
@@ -269,8 +270,10 @@ static ssize_t ibmebus_store_probe(struct bus_type *bus,
        if (!path)
                return -ENOMEM;
 
-       if (bus_find_device(&ibmebus_bus_type, NULL, path,
-                           ibmebus_match_path)) {
+       dev = bus_find_device(&ibmebus_bus_type, NULL, path,
+                             ibmebus_match_path);
+       if (dev) {
+               put_device(dev);
                printk(KERN_WARNING "%s: %s has already been probed\n",
                       __func__, path);
                rc = -EEXIST;
@@ -307,6 +310,7 @@ static ssize_t ibmebus_store_remove(struct bus_type *bus,
        if ((dev = bus_find_device(&ibmebus_bus_type, NULL, path,
                                   ibmebus_match_path))) {
                of_device_unregister(to_platform_device(dev));
+               put_device(dev);
 
                kfree(path);
                return count;