summaryrefslogtreecommitdiff
path: root/drivers/android
diff options
context:
space:
mode:
authorChristian Brauner <christian.brauner@ubuntu.com>2017-08-21 17:13:28 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-08-23 04:45:07 +0300
commit22eb9476b5d80a393ac0ba235c42bccc90b82c76 (patch)
treeec539b0a38b4b6a2f38b88bbe1caba45eed3c251 /drivers/android
parent9e18d0c82f0c07f2a41898d4adbb698a953403ee (diff)
downloadlinux-22eb9476b5d80a393ac0ba235c42bccc90b82c76.tar.xz
binder: free memory on error
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 <christian.brauner@ubuntu.com> Cc: stable <stable@vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/android')
-rw-r--r--drivers/android/binder.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/android/binder.c b/drivers/android/binder.c
index 9f95d7093f32..b366dc9e8217 100644
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@ -5237,7 +5237,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;
@@ -5288,7 +5288,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;
@@ -5302,6 +5303,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);