diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-09-10 16:31:04 -0400 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2017-02-23 03:54:00 +0000 |
| commit | 5974db8fe4a54a6d490f5b9121250fb5105c4157 (patch) | |
| tree | d3bc4d83dad2962ec3ff3a43861b1153f9f0effd /arch/arc/kernel | |
| parent | 473d29f25546d1a41f2a652f4ccf2e6fc3fa3f4e (diff) | |
| download | linux-stable-5974db8fe4a54a6d490f5b9121250fb5105c4157.tar.gz linux-stable-5974db8fe4a54a6d490f5b9121250fb5105c4157.tar.bz2 linux-stable-5974db8fe4a54a6d490f5b9121250fb5105c4157.zip | |
arc: don't leak bits of kernel stack into coredump
commit 7798bf2140ebcc36eafec6a4194fffd8d585d471 upstream.
On faulting sigreturn we do get SIGSEGV, all right, but anything
we'd put into pt_regs could end up in the coredump. And since
__copy_from_user() never zeroed on arc, we'd better bugger off
on its failure without copying random uninitialized bits of
kernel stack into pt_regs...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
[bwh: Backported to 3.16:
- Adjust context
- Don't change the single return statement]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'arch/arc/kernel')
| -rw-r--r-- | arch/arc/kernel/signal.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arc/kernel/signal.c b/arch/arc/kernel/signal.c index a0c63fc48457..0943ff84f28f 100644 --- a/arch/arc/kernel/signal.c +++ b/arch/arc/kernel/signal.c @@ -80,11 +80,12 @@ static int restore_usr_regs(struct pt_regs *regs, struct rt_sigframe __user *sf) int err; err = __copy_from_user(&set, &sf->uc.uc_sigmask, sizeof(set)); - if (!err) - set_current_blocked(&set); - err |= __copy_from_user(regs, &(sf->uc.uc_mcontext.regs.scratch), sizeof(sf->uc.uc_mcontext.regs.scratch)); + if (err) + return err; + + set_current_blocked(&set); return err; } |