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

Commit 07634464 authored by Cornelia Huck's avatar Cornelia Huck Committed by Greg Kroah-Hartman
Browse files

Driver core: Fix error handling in bus_add_driver(). 



- If the allocation of ->priv fails, the reference on the bus
  must be dropped.
- If adding the kobject fails, kobject_put must be called to
  clean things up.

Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 7199677d

drivers/base/bus.c

+5 −4
Original line number Diff line number Diff line
@@ -658,9 +658,10 @@ int bus_add_driver(struct device_driver *drv) 
	pr_debug("bus: '%s': add driver %s\n", bus->name, drv->name);



	priv = kzalloc(sizeof(*priv), GFP_KERNEL);

	if (!priv)

		return -ENOMEM;



	if (!priv) {

		error = -ENOMEM;

		goto out_put_bus;

	}

	klist_init(&priv->klist_devices, NULL, NULL);

	priv->driver = drv;

	drv->p = priv;
@@ -668,7 +669,7 @@ int bus_add_driver(struct device_driver *drv) 
	error = kobject_init_and_add(&priv->kobj, &driver_ktype, NULL,

				     "%s", drv->name);

	if (error)

		goto out_put_bus;

		goto out_unregister;



	if (drv->bus->p->drivers_autoprobe) {

		error = driver_attach(drv);