]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
arc: don't leak bits of kernel stack into coredump
authorAl Viro <viro@zeniv.linux.org.uk>
Sat, 10 Sep 2016 20:31:04 +0000 (16:31 -0400)
committerJiri Slaby <jslaby@suse.cz>
Tue, 8 Nov 2016 15:38:12 +0000 (16:38 +0100)
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>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
arch/arc/kernel/signal.c

index a0c63fc48457db4aa58d58a674a7e0568db0b46f..ca6bcd132a149448df5e057e38ca7e3aab6ed2e7 100644 (file)
@@ -80,13 +80,14 @@ 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;
 
-       return err;
+       set_current_blocked(&set);
+
+       return 0;
 }
 
 static inline int is_do_ss_needed(unsigned int magic)