3 files changed, 10 insertions, 17 deletions

diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
index 5f42cfcc1c5a..e47bed2440ee 100644
--- a/arch/x86/ia32/ia32_signal.c
+++ b/arch/x86/ia32/ia32_signal.c
@@ -446,18 +446,15 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka,
         if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
                 return -EFAULT;
 
-        err |= __put_user(sig, &frame->sig);
-        if (err)
+        if (__put_user(sig, &frame->sig))
                 return -EFAULT;
 
-        err |= ia32_setup_sigcontext(&frame->sc, fpstate, regs, set->sig[0]);
-        if (err)
+        if (ia32_setup_sigcontext(&frame->sc, fpstate, regs, set->sig[0]))
                 return -EFAULT;
 
         if (_COMPAT_NSIG_WORDS > 1) {
-                err |= __copy_to_user(frame->extramask, &set->sig[1],
-                                      sizeof(frame->extramask));
-                if (err)
+                if (__copy_to_user(frame->extramask, &set->sig[1],
+                                   sizeof(frame->extramask)))
                         return -EFAULT;
         }
 
diff --git a/arch/x86/kernel/signal_32.c b/arch/x86/kernel/signal_32.c
index 1c22e0067fe7..d433861a6599 100644
--- a/arch/x86/kernel/signal_32.c
+++ b/arch/x86/kernel/signal_32.c
@@ -351,18 +351,15 @@ __setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,
         if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
                 return -EFAULT;
 
-        err = __put_user(sig, &frame->sig);
-        if (err)
+        if (__put_user(sig, &frame->sig))
                 return -EFAULT;
 
-        err = setup_sigcontext(&frame->sc, fpstate, regs, set->sig[0]);
-        if (err)
+        if (setup_sigcontext(&frame->sc, fpstate, regs, set->sig[0]))
                 return -EFAULT;
 
         if (_NSIG_WORDS > 1) {
-                err = __copy_to_user(&frame->extramask, &set->sig[1],
-                                      sizeof(frame->extramask));
-                if (err)
+                if (__copy_to_user(&frame->extramask, &set->sig[1],
+                                   sizeof(frame->extramask)))
                         return -EFAULT;
         }
 
diff --git a/arch/x86/kernel/signal_64.c b/arch/x86/kernel/signal_64.c
index 3b79e179ba3a..a21c85197295 100644
--- a/arch/x86/kernel/signal_64.c
+++ b/arch/x86/kernel/signal_64.c
@@ -210,7 +210,7 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
                         (unsigned long)fp - sizeof(struct rt_sigframe), 16) - 8;
 
                 if (save_i387_xstate(fp) < 0)
-                        err |= -1;
+                        return -EFAULT;
         } else
                 frame = get_stack(ka, regs, sizeof(struct rt_sigframe)) - 8;
 
@@ -218,8 +218,7 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
                 return -EFAULT;
 
         if (ka->sa.sa_flags & SA_SIGINFO) {
-                err |= copy_siginfo_to_user(&frame->info, info);
-                if (err)
+                if (copy_siginfo_to_user(&frame->info, info))
                         return -EFAULT;
         }