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

Commit 1bec157a authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Force pending restarted system calls to return -EINTR. 



Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent aa88f169

arch/sh/kernel/signal_32.c

+6 −0
Original line number Diff line number Diff line
@@ -216,6 +216,9 @@ asmlinkage int sys_sigreturn(unsigned long r4, unsigned long r5, 
	sigset_t set;

	int r0;



        /* Always make any pending restarted system calls return -EINTR */

	current_thread_info()->restart_block.fn = do_no_restart_syscall;



	if (!access_ok(VERIFY_READ, frame, sizeof(*frame)))

		goto badframe;
@@ -250,6 +253,9 @@ asmlinkage int sys_rt_sigreturn(unsigned long r4, unsigned long r5, 
	sigset_t set;

	int r0;



	/* Always make any pending restarted system calls return -EINTR */

	current_thread_info()->restart_block.fn = do_no_restart_syscall;



	if (!access_ok(VERIFY_READ, frame, sizeof(*frame)))

		goto badframe;

arch/sh/kernel/signal_64.c

+12 −6
Original line number Diff line number Diff line
@@ -375,6 +375,9 @@ asmlinkage int sys_sigreturn(unsigned long r2, unsigned long r3, 
	sigset_t set;

	long long ret;



	/* Always make any pending restarted system calls return -EINTR */

	current_thread_info()->restart_block.fn = do_no_restart_syscall;



	if (!access_ok(VERIFY_READ, frame, sizeof(*frame)))

		goto badframe;
@@ -412,6 +415,9 @@ asmlinkage int sys_rt_sigreturn(unsigned long r2, unsigned long r3, 
	stack_t __user st;

	long long ret;



	/* Always make any pending restarted system calls return -EINTR */

	current_thread_info()->restart_block.fn = do_no_restart_syscall;



	if (!access_ok(VERIFY_READ, frame, sizeof(*frame)))

		goto badframe;