From f93f1b05c19fc99d88d4e128618009cbe889bed0 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Thu, 14 Oct 2010 13:34:03 -0400 Subject: [PATCH] --- yaml --- r: 227851 b: refs/heads/master c: 751c88a2c362a4a8985f9a2cb5daf7cd9ce1c4d0 h: refs/heads/master i: 227849: 14decb7833c2ddc6708eefdd4676b6b7f214fb52 227847: 3e714407b40de78ae0bb7f20b190661a8159b9c8 v: v3 --- [refs] | 2 +- trunk/arch/m68knommu/kernel/signal.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 1b7bb8fca2a5..c48b7eec23c5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8972be4d44fbec0b2e1d7b68874fb61c5bf7b06a +refs/heads/master: 751c88a2c362a4a8985f9a2cb5daf7cd9ce1c4d0 diff --git a/trunk/arch/m68knommu/kernel/signal.c b/trunk/arch/m68knommu/kernel/signal.c index 15ac8205e7ca..36a81bb6835a 100644 --- a/trunk/arch/m68knommu/kernel/signal.c +++ b/trunk/arch/m68knommu/kernel/signal.c @@ -85,10 +85,10 @@ sys_sigaction(int sig, const struct old_sigaction __user *act, old_sigset_t mask; if (!access_ok(VERIFY_READ, act, sizeof(*act)) || __get_user(new_ka.sa.sa_handler, &act->sa_handler) || - __get_user(new_ka.sa.sa_restorer, &act->sa_restorer)) + __get_user(new_ka.sa.sa_restorer, &act->sa_restorer) || + __get_user(new_ka.sa.sa_flags, &act->sa_flags) || + __get_user(mask, &act->sa_mask)) return -EFAULT; - __get_user(new_ka.sa.sa_flags, &act->sa_flags); - __get_user(mask, &act->sa_mask); siginitset(&new_ka.sa.sa_mask, mask); } @@ -97,10 +97,10 @@ sys_sigaction(int sig, const struct old_sigaction __user *act, if (!ret && oact) { if (!access_ok(VERIFY_WRITE, oact, sizeof(*oact)) || __put_user(old_ka.sa.sa_handler, &oact->sa_handler) || - __put_user(old_ka.sa.sa_restorer, &oact->sa_restorer)) + __put_user(old_ka.sa.sa_restorer, &oact->sa_restorer) || + __put_user(old_ka.sa.sa_flags, &oact->sa_flags) || + __put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask)) return -EFAULT; - __put_user(old_ka.sa.sa_flags, &oact->sa_flags); - __put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask); } return ret;