From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754275AbdHUNhE (ORCPT ); Mon, 21 Aug 2017 09:37:04 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:33354 "EHLO mx2.mailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754186AbdHUNhB (ORCPT ); Mon, 21 Aug 2017 09:37:01 -0400 From: Christian Brauner To: gregkh@linuxfoundation.org, arve@android.com, riandrews@android.com, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Cc: Christian Brauner Subject: [PATCH 1/1] binder: free memory on error Date: Mon, 21 Aug 2017 15:36:16 +0200 Message-Id: <20170821133616.22247-2-christian.brauner@ubuntu.com> In-Reply-To: <20170821133616.22247-1-christian.brauner@ubuntu.com> References: <20170821133616.22247-1-christian.brauner@ubuntu.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Christian Brauner --- drivers/android/binder.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/android/binder.c b/drivers/android/binder.c index f7665c31feca..41a11661eed7 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; @@ -4279,6 +4280,7 @@ static int __init binder_init(void) } err_alloc_device_names_failed: debugfs_remove_recursive(binder_debugfs_dir_entry_root); + kfree(device_names); return ret; } -- 2.13.3