summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>2017-08-29 21:23:49 +0200
committerBen Hutchings <ben@decadent.org.uk>2017-11-26 13:51:06 +0000
commit79ac778a4f68c4609e069eb965586af42dd71119 (patch)
treeaa22b4c7d19f058b9e4fd3950988939f52e92044 /drivers
parent5abbd54557e1d841669b35c10558e1556d6a32c2 (diff)
downloadlinux-79ac778a4f68c4609e069eb965586af42dd71119.tar.gz
linux-79ac778a4f68c4609e069eb965586af42dd71119.tar.bz2
linux-79ac778a4f68c4609e069eb965586af42dd71119.zip
driver core: bus: Fix a potential double free
commit 0f9b011d3321ca1079c7a46c18cb1956fbdb7bcb upstream. The .release function of driver_ktype is 'driver_release()'. This function frees the container_of this kobject. So, this memory must not be freed explicitly in the error handling path of 'bus_add_driver()'. Otherwise a double free will occur. Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/base/bus.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index b802cfc66fbc..db41a4ba1c45 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -684,7 +684,7 @@ int bus_add_driver(struct device_driver *drv)
out_unregister:
kobject_put(&priv->kobj);
- kfree(drv->p);
+ /* drv->p is freed in driver_release() */
drv->p = NULL;
out_put_bus:
bus_put(bus);