]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
binder: check for binder_thread allocation failure in binder_poll()
authorEric Biggers <ebiggers@google.com>
Wed, 31 Jan 2018 07:11:24 +0000 (23:11 -0800)
committerSasha Levin <alexander.levin@microsoft.com>
Sun, 4 Mar 2018 15:28:25 +0000 (10:28 -0500)
[ Upstream commit f88982679f54f75daa5b8eff3da72508f1e7422f ]

If the kzalloc() in binder_get_thread() fails, binder_poll()
dereferences the resulting NULL pointer.

Fix it by returning POLLERR if the memory allocation failed.

This bug was found by syzkaller using fault injection.

Reported-by: syzbot <syzkaller@googlegroups.com>
Fixes: 457b9a6f09f0 ("Staging: android: add binder driver")
Cc: stable@vger.kernel.org
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
drivers/android/binder.c

index 235ba1fbabdbf78c0a6e70bee477f23ea1716ef1..b834278c0c4d2cc4445095fd4d1a29146a283dc7 100644 (file)
@@ -2618,6 +2618,8 @@ static unsigned int binder_poll(struct file *filp,
        binder_lock(__func__);
 
        thread = binder_get_thread(proc);
+       if (!thread)
+               return POLLERR;
 
        wait_for_proc_work = thread->transaction_stack == NULL &&
                list_empty(&thread->todo) && thread->return_error == BR_OK;