diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2010-10-14 13:34:03 -0400 |
---|---|---|
committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2011-01-07 08:07:00 -0500 |
commit | 751c88a2c362a4a8985f9a2cb5daf7cd9ce1c4d0 (patch) | |
tree | 40fac66649d1a29859a973c42f16ea91daa93694 /arch/m68knommu | |
parent | 8972be4d44fbec0b2e1d7b68874fb61c5bf7b06a (diff) |
m68knommu: Need to check __get_user()/__put_user() result
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Acked-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68knommu')
-rw-r--r-- | arch/m68knommu/kernel/signal.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/m68knommu/kernel/signal.c b/arch/m68knommu/kernel/signal.c index 15ac8205e7ca..36a81bb6835a 100644 --- a/arch/m68knommu/kernel/signal.c +++ b/arch/m68knommu/kernel/signal.c | |||
@@ -85,10 +85,10 @@ sys_sigaction(int sig, const struct old_sigaction __user *act, | |||
85 | old_sigset_t mask; | 85 | old_sigset_t mask; |
86 | if (!access_ok(VERIFY_READ, act, sizeof(*act)) || | 86 | if (!access_ok(VERIFY_READ, act, sizeof(*act)) || |
87 | __get_user(new_ka.sa.sa_handler, &act->sa_handler) || | 87 | __get_user(new_ka.sa.sa_handler, &act->sa_handler) || |
88 | __get_user(new_ka.sa.sa_restorer, &act->sa_restorer)) | 88 | __get_user(new_ka.sa.sa_restorer, &act->sa_restorer) || |
89 | __get_user(new_ka.sa.sa_flags, &act->sa_flags) || | ||
90 | __get_user(mask, &act->sa_mask)) | ||
89 | return -EFAULT; | 91 | return -EFAULT; |
90 | __get_user(new_ka.sa.sa_flags, &act->sa_flags); | ||
91 | __get_user(mask, &act->sa_mask); | ||
92 | siginitset(&new_ka.sa.sa_mask, mask); | 92 | siginitset(&new_ka.sa.sa_mask, mask); |
93 | } | 93 | } |
94 | 94 | ||
@@ -97,10 +97,10 @@ sys_sigaction(int sig, const struct old_sigaction __user *act, | |||
97 | if (!ret && oact) { | 97 | if (!ret && oact) { |
98 | if (!access_ok(VERIFY_WRITE, oact, sizeof(*oact)) || | 98 | if (!access_ok(VERIFY_WRITE, oact, sizeof(*oact)) || |
99 | __put_user(old_ka.sa.sa_handler, &oact->sa_handler) || | 99 | __put_user(old_ka.sa.sa_handler, &oact->sa_handler) || |
100 | __put_user(old_ka.sa.sa_restorer, &oact->sa_restorer)) | 100 | __put_user(old_ka.sa.sa_restorer, &oact->sa_restorer) || |
101 | __put_user(old_ka.sa.sa_flags, &oact->sa_flags) || | ||
102 | __put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask)) | ||
101 | return -EFAULT; | 103 | return -EFAULT; |
102 | __put_user(old_ka.sa.sa_flags, &oact->sa_flags); | ||
103 | __put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask); | ||
104 | } | 104 | } |
105 | 105 | ||
106 | return ret; | 106 | return ret; |