Commit 310862e5 authored by Schspa Shi's avatar Schspa Shi Committed by Greg Kroah-Hartman

driver: base: fix UAF when driver_attach failed

When driver_attach(drv); failed, the driver_private will be freed.
But it has been added to the bus, which caused a UAF.

To fix it, we need to delete it from the bus when failed.

Fixes: 190888ac ("driver core: fix possible missing of device probe")
Signed-off-by: default avatarSchspa Shi <schspa@gmail.com>
Link: https://lore.kernel.org/r/20220513112444.45112-1-schspa@gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 185b29c6
...@@ -617,7 +617,7 @@ int bus_add_driver(struct device_driver *drv) ...@@ -617,7 +617,7 @@ int bus_add_driver(struct device_driver *drv)
if (drv->bus->p->drivers_autoprobe) { if (drv->bus->p->drivers_autoprobe) {
error = driver_attach(drv); error = driver_attach(drv);
if (error) if (error)
goto out_unregister; goto out_del_list;
} }
module_add_driver(drv->owner, drv); module_add_driver(drv->owner, drv);
...@@ -644,6 +644,8 @@ int bus_add_driver(struct device_driver *drv) ...@@ -644,6 +644,8 @@ int bus_add_driver(struct device_driver *drv)
return 0; return 0;
out_del_list:
klist_del(&priv->knode_bus);
out_unregister: out_unregister:
kobject_put(&priv->kobj); kobject_put(&priv->kobj);
/* drv->p is freed in driver_release() */ /* drv->p is freed in driver_release() */
......
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