Skip to content

Commit

Permalink
uio: fix incorrect memory leak cleanup
Browse files Browse the repository at this point in the history
Commit 75f0aef ("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: 75f0aef ("uio: fix memory leak")
Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
sumananna authored and gregkh committed May 16, 2017
1 parent a20cfc1 commit 0d83539
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/uio/uio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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++) {
Expand All @@ -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;
Expand All @@ -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;
Expand Down

0 comments on commit 0d83539

Please sign in to comment.