Return-Path: Received: from mail-it0-f68.google.com ([209.85.214.68]:53068 "EHLO mail-it0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751175AbeBZS7B (ORCPT ); Mon, 26 Feb 2018 13:59:01 -0500 Received: by mail-it0-f68.google.com with SMTP id k135so7064593ite.2 for ; Mon, 26 Feb 2018 10:59:00 -0800 (PST) From: Eric Biggers To: stable@vger.kernel.org, Greg Kroah-Hartman Cc: Guenter Roeck , Todd Kjos , Eric Biggers Subject: [PATCH 4.4,4.9] binder: add missing binder_unlock() Date: Mon, 26 Feb 2018 10:56:45 -0800 Message-Id: <20180226185645.241652-1-ebiggers3@gmail.com> Sender: stable-owner@vger.kernel.org List-ID: From: Eric Biggers [Please apply to 4.4-stable and 4.9-stable.] When commit 4be5a2810489 ("binder: check for binder_thread allocation failure in binder_poll()") was applied to 4.4-stable and 4.9-stable it was forgotten to release the global binder lock in the new error path. The global binder lock wasn't removed until v4.14, by commit a60b890f607d ("binder: remove global binder lock"). Fix the new error path to release the lock. Reported-by: Guenter Roeck Signed-off-by: Eric Biggers --- drivers/android/binder.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/android/binder.c b/drivers/android/binder.c index 3b6ac80b2127..49199bd2ab93 100644 --- a/drivers/android/binder.c +++ b/drivers/android/binder.c @@ -2628,8 +2628,10 @@ static unsigned int binder_poll(struct file *filp, binder_lock(__func__); thread = binder_get_thread(proc); - if (!thread) + if (!thread) { + binder_unlock(__func__); return POLLERR; + } wait_for_proc_work = thread->transaction_stack == NULL && list_empty(&thread->todo) && thread->return_error == BR_OK; -- 2.16.1.291.g4437f3f132-goog