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

Commit 0d835390 authored by Suman Anna's avatar Suman Anna Committed by Greg Kroah-Hartman
Browse files

uio: fix incorrect memory leak cleanup 



Commit 75f0aef6 ("uio: fix memory leak") has fixed up some
memory leaks during the failure paths of the addition of uio
attributes, but still is not correct entirely. A kobject_uevent()
failure still needs a kobject_put() and the kobject container
structure allocation failure before the kobject_init() doesn't
need a kobject_put(). Fix this properly.

Fixes: 75f0aef6 ("uio: fix memory leak")
Signed-off-by: default avatarSuman Anna <s-anna@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a20cfc1c

drivers/uio/uio.c

+4 −4
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ static int uio_dev_add_attributes(struct uio_device *idev) 
		map = kzalloc(sizeof(*map), GFP_KERNEL);

		if (!map) {

			ret = -ENOMEM;

			goto err_map_kobj;

			goto err_map;

		}

		kobject_init(&map->kobj, &map_attr_type);

		map->mem = mem;
@@ -289,7 +289,7 @@ static int uio_dev_add_attributes(struct uio_device *idev) 
			goto err_map_kobj;

		ret = kobject_uevent(&map->kobj, KOBJ_ADD);

		if (ret)

			goto err_map;

			goto err_map_kobj;

	}



	for (pi = 0; pi < MAX_UIO_PORT_REGIONS; pi++) {
@@ -308,7 +308,7 @@ static int uio_dev_add_attributes(struct uio_device *idev) 
		portio = kzalloc(sizeof(*portio), GFP_KERNEL);

		if (!portio) {

			ret = -ENOMEM;

			goto err_portio_kobj;

			goto err_portio;

		}

		kobject_init(&portio->kobj, &portio_attr_type);

		portio->port = port;
@@ -319,7 +319,7 @@ static int uio_dev_add_attributes(struct uio_device *idev) 
			goto err_portio_kobj;

		ret = kobject_uevent(&portio->kobj, KOBJ_ADD);

		if (ret)

			goto err_portio;

			goto err_portio_kobj;

	}



	return 0;