Commit f3a443af authored by Linus Torvalds's avatar Linus Torvalds

Merge git://

Pull sparc fix from David Miller:
 "Bug fix from Al Viro"

* git://
  sparc64: not any error from do_sigaltstack() should fail rt_sigreturn()
parents 45aaff06 fae2ae2a
......@@ -295,9 +295,7 @@ void do_rt_sigreturn(struct pt_regs *regs)
err |= restore_fpu_state(regs, fpu_save);
err |= __copy_from_user(&set, &sf->mask, sizeof(sigset_t));
err |= do_sigaltstack(&sf->stack, NULL, (unsigned long)sf);
if (err)
if (err || do_sigaltstack(&sf->stack, NULL, (unsigned long)sf) == -EFAULT)
goto segv;
err |= __get_user(rwin_save, &sf->rwin_save);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment