Commit 693ef09d authored by Christian Brauner's avatar Christian Brauner Committed by Greg Kroah-Hartman

binder: free memory on error

commit 22eb9476 upstream.

On binder_init() the devices string is duplicated and smashed into individual
device names which are passed along. However, the original duplicated string
wasn't freed in case binder_init() failed. Let's free it on error.
Signed-off-by: default avatarChristian Brauner <christian.brauner@ubuntu.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bbe1a3b3
...@@ -4215,7 +4215,7 @@ static int __init init_binder_device(const char *name) ...@@ -4215,7 +4215,7 @@ static int __init init_binder_device(const char *name)
static int __init binder_init(void) static int __init binder_init(void)
{ {
int ret; int ret;
char *device_name, *device_names; char *device_name, *device_names, *device_tmp;
struct binder_device *device; struct binder_device *device;
struct hlist_node *tmp; struct hlist_node *tmp;
...@@ -4263,7 +4263,8 @@ static int __init binder_init(void) ...@@ -4263,7 +4263,8 @@ static int __init binder_init(void)
} }
strcpy(device_names, binder_devices_param); strcpy(device_names, binder_devices_param);
while ((device_name = strsep(&device_names, ","))) { device_tmp = device_names;
while ((device_name = strsep(&device_tmp, ","))) {
ret = init_binder_device(device_name); ret = init_binder_device(device_name);
if (ret) if (ret)
goto err_init_binder_device_failed; goto err_init_binder_device_failed;
...@@ -4277,6 +4278,9 @@ static int __init binder_init(void) ...@@ -4277,6 +4278,9 @@ static int __init binder_init(void)
hlist_del(&device->hlist); hlist_del(&device->hlist);
kfree(device); kfree(device);
} }
kfree(device_names);
err_alloc_device_names_failed: err_alloc_device_names_failed:
debugfs_remove_recursive(binder_debugfs_dir_entry_root); debugfs_remove_recursive(binder_debugfs_dir_entry_root);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment