From: Christian Brauner Date: Mon, 21 Aug 2017 14:13:28 +0000 (+0200) Subject: binder: free memory on error X-Git-Tag: v4.12.12~26 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=693ef09dc616ec016cca52ded708f8a9527ec44a;p=thirdparty%2Fkernel%2Fstable.git binder: free memory on error commit 22eb9476b5d80a393ac0ba235c42bccc90b82c76 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: Christian Brauner Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/android/binder.c b/drivers/android/binder.c index 831cdd7d197db..3db96b79d122f 100644 --- a/drivers/android/binder.c +++ b/drivers/android/binder.c @@ -4215,7 +4215,7 @@ static int __init init_binder_device(const char *name) static int __init binder_init(void) { int ret; - char *device_name, *device_names; + char *device_name, *device_names, *device_tmp; struct binder_device *device; struct hlist_node *tmp; @@ -4263,7 +4263,8 @@ static int __init binder_init(void) } 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); if (ret) goto err_init_binder_device_failed; @@ -4277,6 +4278,9 @@ err_init_binder_device_failed: hlist_del(&device->hlist); kfree(device); } + + kfree(device_names); + err_alloc_device_names_failed: debugfs_remove_recursive(binder_debugfs_dir_entry_root);