From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754216AbdHUOOf (ORCPT ); Mon, 21 Aug 2017 10:14:35 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:54959 "EHLO mx2.mailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753238AbdHUONg (ORCPT ); Mon, 21 Aug 2017 10:13:36 -0400 From: Christian Brauner To: gregkh@linuxfoundation.org, arve@android.com, riandrews@android.com, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, dan.carpenter@oracle.com Cc: Christian Brauner Subject: [PATCH 1/1 v2] binder: free memory on error Date: Mon, 21 Aug 2017 16:13:28 +0200 Message-Id: <20170821141328.29238-2-christian.brauner@ubuntu.com> In-Reply-To: <20170821141328.29238-1-christian.brauner@ubuntu.com> References: <20170821141328.29238-1-christian.brauner@ubuntu.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- Changelog v2 2017-08-21: - use more descriptive commit message - call kfree(device_names) on correct position --- drivers/android/binder.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/android/binder.c b/drivers/android/binder.c index f7665c31feca..a6ae339223f6 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 @@ static int __init binder_init(void) hlist_del(&device->hlist); kfree(device); } + + kfree(device_names); + err_alloc_device_names_failed: debugfs_remove_recursive(binder_debugfs_dir_entry_root); -- 2.13.3