Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a02d0f68 authored by Marco Ballesio's avatar Marco Ballesio Committed by Li Li
Browse files

FROMGIT: binder: use EINTR for interrupted wait for work 

when interrupted by a signal, binder_wait_for_work currently returns
-ERESTARTSYS. This error code isn't propagated to user space, but a way
to handle interruption due to signals must be provided to code using
this API.

Replace this instance of -ERESTARTSYS with -EINTR, which is propagated
to user space.

Bug: 180989544
(cherry picked from commit 48f10b7ed0c23e2df7b2c752ad1d3559dad007f9
 git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git

 char-misc-testing)
Signed-off-by: default avatarMarco Ballesio <balejs@google.com>
Signed-off-by: default avatarLi Li <dualli@google.com>
Test: built, booted, interrupted a worker thread within
Acked-by: default avatarTodd Kjos <tkjos@google.com>
Link: https://lore.kernel.org/r/20210316011630.1121213-3-dualli@chromium.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Change-Id: Ie6c7993cab699bc2c1a25a2f9d94b200a1156e5d
parent e658e9e4

drivers/android/binder.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -3847,7 +3847,7 @@ static int binder_wait_for_work(struct binder_thread *thread, 
		binder_inner_proc_lock(proc);

		binder_inner_proc_lock(proc);

		list_del_init(&thread->waiting_thread_node);

		list_del_init(&thread->waiting_thread_node);

		if (signal_pending(current)) {

		if (signal_pending(current)) {

			ret = -ERESTARTSYS;

			ret = -EINTR;

			break;

			break;

		}

		}

	}

	}
@@ -4995,7 +4995,7 @@ static long binder_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
	if (thread)

	if (thread)

		thread->looper_need_return = false;

		thread->looper_need_return = false;

	wait_event_interruptible(binder_user_error_wait, binder_stop_on_user_error < 2);

	wait_event_interruptible(binder_user_error_wait, binder_stop_on_user_error < 2);

	if (ret && ret != -ERESTARTSYS)

	if (ret && ret != -EINTR)

		pr_info("%d:%d ioctl %x %lx returned %d\n", proc->pid, current->pid, cmd, arg, ret);

		pr_info("%d:%d ioctl %x %lx returned %d\n", proc->pid, current->pid, cmd, arg, ret);

err_unlocked:

err_unlocked:

	trace_binder_ioctl_done(ret);

	trace_binder_ioctl_done(ret);