summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-11-20 10:36:17 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2012-11-28 21:46:12 -0500
commitafd3f96dc34357584763c2dc453192c78a9dbce0 (patch)
treea63b5f4c70e9cf947ce7410a2265955849e8b579 /arch
parent9dc87c7b5b0a2db407e086f45cf08ca78208cc16 (diff)
downloadlinux-3.10-afd3f96dc34357584763c2dc453192c78a9dbce0.tar.gz
linux-3.10-afd3f96dc34357584763c2dc453192c78a9dbce0.tar.bz2
linux-3.10-afd3f96dc34357584763c2dc453192c78a9dbce0.zip
score: do_sigaltstack() expects a userland pointer...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/score/kernel/signal.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/score/kernel/signal.c b/arch/score/kernel/signal.c
index c268bbf8b41..02353bde92d 100644
--- a/arch/score/kernel/signal.c
+++ b/arch/score/kernel/signal.c
@@ -148,7 +148,6 @@ score_rt_sigreturn(struct pt_regs *regs)
{
struct rt_sigframe __user *frame;
sigset_t set;
- stack_t st;
int sig;
/* Always make any pending restarted system calls return -EINTR */
@@ -168,12 +167,10 @@ score_rt_sigreturn(struct pt_regs *regs)
else if (sig)
force_sig(sig, current);
- if (__copy_from_user(&st, &frame->rs_uc.uc_stack, sizeof(st)))
- goto badframe;
-
/* It is more difficult to avoid calling this function than to
call it and ignore errors. */
- do_sigaltstack((stack_t __user *)&st, NULL, regs->regs[0]);
+ if (do_sigaltstack(&frame->rs_uc.uc_stack, NULL, regs->regs[0]) == -EFAULT)
+ goto badframe;
regs->is_syscall = 0;
__asm__ __volatile__(