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>

diff --git a/drivers/android/binder.c b/drivers/android/binder.c
index 9f95d7093f321f7e0f48d6a22e7a8117519bf67f..b366dc9e8217778104b8c562bb187c2855cb33e5 100644 (file)
--- 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);