]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
binder: use EPOLLERR from eventpoll.h
authorCarlos Llamas <cmllamas@google.com>
Fri, 1 Dec 2023 17:21:30 +0000 (17:21 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 5 Dec 2023 00:23:37 +0000 (09:23 +0900)
Use EPOLLERR instead of POLLERR to make sure it is cast to the correct
__poll_t type. This fixes the following sparse issue:

  drivers/android/binder.c:5030:24: warning: incorrect type in return expression (different base types)
  drivers/android/binder.c:5030:24:    expected restricted __poll_t
  drivers/android/binder.c:5030:24:    got int

Fixes: f88982679f54 ("binder: check for binder_thread allocation failure in binder_poll()")
Cc: stable@vger.kernel.org
Cc: Eric Biggers <ebiggers@google.com>
Reviewed-by: Alice Ryhl <aliceryhl@google.com>
Signed-off-by: Carlos Llamas <cmllamas@google.com>
Link: https://lore.kernel.org/r/20231201172212.1813387-2-cmllamas@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/android/binder.c

index 92128aae2d0601ed9a7b08486d756bcd44016ace..71a40a4c546f5f5d46be34114fa7773da7b4bde6 100644 (file)
@@ -5030,7 +5030,7 @@ static __poll_t binder_poll(struct file *filp,
 
        thread = binder_get_thread(proc);
        if (!thread)
-               return POLLERR;
+               return EPOLLERR;
 
        binder_inner_proc_lock(thread->proc);
        thread->looper |= BINDER_LOOPER_STATE_POLL;