Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d709f58 authored by Schspa Shi's avatar Schspa Shi Committed by Greg Kroah-Hartman
Browse files

driver: base: fix UAF when driver_attach failed 



[ Upstream commit 310862e574001a97ad02272bac0fd13f75f42a27 ]

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.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 3157118c

drivers/base/bus.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -620,7 +620,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);
@@ -647,6 +647,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()  */