diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-02 19:32:06 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-02 19:32:06 -0800 |
| commit | 6ec40b423032ca769c96fbf9a080db822821893d (patch) | |
| tree | 862950eb804bd849e22d6abca7b02a21c9c430df | |
| parent | 8d05b3771da8775799673212b57d62f57c70d68a (diff) | |
| parent | db61ec29fd56e089007cb7d9a646ea9ddf518c4d (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal
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()
| -rw-r--r-- | kernel/signal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/signal.c b/kernel/signal.c index 2676aac4103..2ec870a4c3c 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; |