summaryrefslogtreecommitdiffstats
path: root/drivers/base/bus.c
diff options
context:
space:
mode:
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>2017-08-29 21:23:49 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-08-31 18:57:30 +0200
commit0f9b011d3321ca1079c7a46c18cb1956fbdb7bcb (patch)
tree9d80c487fe9e60ce59a0553ca30485a6775db046 /drivers/base/bus.c
parent7521621e600aeefe5ffcc1f90ae26a42fc20c452 (diff)
downloadlinux-0f9b011d3321ca1079c7a46c18cb1956fbdb7bcb.tar.bz2
driver core: bus: Fix a potential double free
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> Cc: stable <stable@vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base/bus.c')
-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 e162c9a789ba..22a64fd3309b 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -698,7 +698,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);