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

Commit 3b7d15bd authored by Al Viro's avatar Al Viro
Browse files

um: ->restart_block.fn needs to be reset on sigreturn 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 76e10d15

arch/um/kernel/signal.c

+0 −3
Original line number Diff line number Diff line
@@ -29,9 +29,6 @@ static int handle_signal(struct pt_regs *regs, unsigned long signr, 
	unsigned long sp;

	int err;



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

	current_thread_info()->restart_block.fn = do_no_restart_syscall;



	/* Did we come from a system call? */

	if (PT_REGS_SYSCALL_NR(regs) >= 0) {

		/* If so, check system call restarting.. */

arch/x86/um/signal.c

+3 −0
Original line number Diff line number Diff line
@@ -156,6 +156,9 @@ static int copy_sc_from_user(struct pt_regs *regs, 
	struct sigcontext sc;

	int err, pid;



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

	current_thread_info()->restart_block.fn = do_no_restart_syscall;



	err = copy_from_user(&sc, from, sizeof(sc));

	if (err)

		return err;