Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

6ec40b42 · Linus Torvalds <[email protected]> · 2013-03-02 19:32:06 -08:00

Pull sigprocmask compat fix from Al Viro:
 "generic compat_sys_rt_sigprocmask() had a very dumb braino; I'd spent
  quite a while staring at the offending commit before finally managing
  to spot the idiocy ;-/"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal:
  fix compat_sys_rt_sigprocmask()

Commit: 6ec40b423032ca769c96fbf9a080db822821893d
Parents: 8d05b377 · db61ec29

Merge commit. Changes below are compared with the first parent: 8d05b377.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
kernel/signal.c	modified	+1	−1	View file

kernel/signal.c

View file

diff --git a/kernel/signal.c b/kernel/signal.c
index 2676aac..2ec870a 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -2653,7 +2653,7 @@ COMPAT_SYSCALL_DEFINE4(rt_sigprocmask, int, how, compat_sigset_t __user *, nset,
 	if (oset) {
 		compat_sigset_t old32;
 		sigset_to_compat(&old32, &old_set);
-		if (copy_to_user(oset, &old_set, sizeof(sigset_t)))
+		if (copy_to_user(oset, &old32, sizeof(compat_sigset_t)))
 			return -EFAULT;
 	}
 	return 0;