Commit d478376c authored Mar 28, 2008 by Jesper Juhl Committed by Linus Torvalds Mar 28, 2008

driver core: fix small mem leak in driver_add_kobj()



The Coverity checker spotted that we leak the storage allocated to 'name' in
int driver_add_kobj().  The leak looks legit to me - this is the code :

int driver_add_kobj(struct device_driver *drv, struct kobject *kobj,
                    const char *fmt, ...)
{
        va_list args;
        char *name;
        int ret;

        va_start(args, fmt);
        name = kvasprintf(GFP_KERNEL, fmt, args);
        ^^^^^^^^ This dynamically allocates space...

        va_end(args);

        if (!name)
                return -ENOMEM;

        return kobject_add(kobj, &drv->p->kobj, "%s", name);
	^^^^^^^^ This neglects to free the space allocated
}

Inside kobject_add() a copy of 'name' will be made and used.  As far as I can
see, Coverity is correct in flagging this as a leak, but I'd like some
configmation before the patch is applied.

This should fix it.

Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Cc: Greg KH <greg@kroah.com>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 4cdc1d1f

drivers/base/driver.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -133,6 +133,7 @@ int driver_add_kobj(struct device_driver drv, struct kobject kobj,
		{
		va_list args;
		char *name;
		int ret;

		va_start(args, fmt);
		name = kvasprintf(GFP_KERNEL, fmt, args);
		@@ -141,7 +142,9 @@ int driver_add_kobj(struct device_driver drv, struct kobject kobj,
		if (!name)
		return -ENOMEM;

		return kobject_add(kobj, &drv->p->kobj, "%s", name);
		ret = kobject_add(kobj, &drv->p->kobj, "%s", name);
		kfree(name);
		return ret;
		}
		EXPORT_SYMBOL_GPL(driver_add_kobj);