Commit 4e3df37e authored Jan 06, 2006 by Cedric Le Goater Committed by Linus Torvalds Jan 06, 2006

[PATCH] s390: rt_sigreturn fix



Check return code of do_sigaltstack and force a SIGSEGV if it is -EFAULT.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Cedric Le Goater <clg@fr.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent a63a4931

arch/s390/kernel/compat_signal.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -467,8 +467,6 @@ asmlinkage long sys32_rt_sigreturn(struct pt_regs *regs)
		if (err)
		goto badframe;

		/* It is more difficult to avoid calling this function than to
		call it and ignore errors. */
		set_fs (KERNEL_DS);
		do_sigaltstack((stack_t __user *)&st, NULL, regs->gprs[15]);
		set_fs (old_fs);

arch/s390/kernel/signal.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -254,9 +254,9 @@ asmlinkage long sys_rt_sigreturn(struct pt_regs *regs)
		if (restore_sigregs(regs, &frame->uc.uc_mcontext))
		goto badframe;

		/* It is more difficult to avoid calling this function than to
		call it and ignore errors. */
		do_sigaltstack(&frame->uc.uc_stack, NULL, regs->gprs[15]);
		if (do_sigaltstack(&frame->uc.uc_stack, NULL,
		regs->gprs[15]) == -EFAULT)
		goto badframe;
		return regs->gprs[2];

		badframe: