mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

driver: base: fix UAF when driver_attach failed

Browse Source 
[ Upstream commit 310862e574 ]

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: 190888ac01 ("driver core: fix possible missing of device probe")
Signed-off-by: Schspa Shi <schspa@gmail.com>
Link: https://lore.kernel.org/r/20220513112444.45112-1-schspa@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Schspa Shi
2022-05-13 19:24:44 +08:00
committed by Greg Kroah-Hartman
parent 7a6337bfed
commit 823f24f2e3
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/base/bus.c
View File

@@ -621,7 +621,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);
@@ -648,6 +648,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() */