sparc: ptrace: user_regset_copyin_ignore() always returns 0

user_regset_copyin_ignore() always returns 0, so checking its result seems
pointless -- don't do this anymore...

Link: https://lkml.kernel.org/r/20221014212235.10770-13-s.shtylyov@omp.ru
Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru>
Cc: Brian Cain <bcain@quicinc.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: David S. Miller <davem@davemloft.net>
Cc: Dinh Nguyen <dinguyen@kernel.org>
Cc: Helge Deller <deller@gmx.de>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Cc: Jonas Bonn <jonas@southpole.se>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Rich Felker <dalias@libc.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Stafford Horne <shorne@gmail.com>
Cc: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Will Deacon <will@kernel.org>
Cc: Yoshinori Sato <ysato@users.osdn.me>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/arch/sparc/kernel/ptrace_32.c b/arch/sparc/kernel/ptrace_32.c
index e7db48acb838b45e98c9a86f18d38b69b9c65947..c273ccebea46a3e40146335999611e06c3c7efea 100644 (file)
--- a/arch/sparc/kernel/ptrace_32.c
+++ b/arch/sparc/kernel/ptrace_32.c
@@ -158,8 +158,9 @@ static int genregs32_set(struct task_struct *target,
                                 35 * sizeof(u32), 36 * sizeof(u32));
        if (ret || !count)
                return ret;
-       return user_regset_copyin_ignore(&pos, &count, &kbuf, &ubuf,
-                                        36 * sizeof(u32), 38 * sizeof(u32));
+       user_regset_copyin_ignore(&pos, &count, &kbuf, &ubuf, 36 * sizeof(u32),
+                                 38 * sizeof(u32));
+       return 0;
 }
 
 static int fpregs32_get(struct task_struct *target,
@@ -203,8 +204,8 @@ static int fpregs32_set(struct task_struct *target,
                                         33 * sizeof(u32),
                                         34 * sizeof(u32));
        if (!ret)
-               ret = user_regset_copyin_ignore(&pos, &count, &kbuf, &ubuf,
-                                               34 * sizeof(u32), -1);
+               user_regset_copyin_ignore(&pos, &count, &kbuf, &ubuf,
+                                         34 * sizeof(u32), -1);
        return ret;
 }
 

diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c
index 86a7eb5c27babfae4a9aadc3b48abdb82a14cd50..4deba5b6eddb5c9e1d9cfc90f4fdd5d6733c3ec8 100644 (file)
--- a/arch/sparc/kernel/ptrace_64.c
+++ b/arch/sparc/kernel/ptrace_64.c
@@ -332,8 +332,8 @@ static int genregs64_set(struct task_struct *target,
        }
 
        if (!ret)
-               ret = user_regset_copyin_ignore(&pos, &count, &kbuf, &ubuf,
-                                               36 * sizeof(u64), -1);
+               user_regset_copyin_ignore(&pos, &count, &kbuf, &ubuf,
+                                         36 * sizeof(u64), -1);
 
        return ret;
 }
@@ -406,8 +406,8 @@ static int fpregs64_set(struct task_struct *target,
        task_thread_info(target)->fpsaved[0] = fprs;
 
        if (!ret)
-               ret = user_regset_copyin_ignore(&pos, &count, &kbuf, &ubuf,
-                                               35 * sizeof(u64), -1);
+               user_regset_copyin_ignore(&pos, &count, &kbuf, &ubuf,
+                                         35 * sizeof(u64), -1);
        return ret;
 }
 
@@ -473,10 +473,8 @@ static int setregs64_set(struct task_struct *target,
                                 15 * sizeof(u64));
        if (ret)
                return ret;
-       ret =user_regset_copyin_ignore(&pos, &count, &kbuf, &ubuf,
-                                15 * sizeof(u64), 16 * sizeof(u64));
-       if (ret)
-               return ret;
+       user_regset_copyin_ignore(&pos, &count, &kbuf, &ubuf,
+                                 15 * sizeof(u64), 16 * sizeof(u64));
        /* TSTATE */
        ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,
                                 &tstate,
@@ -670,8 +668,9 @@ finish:
        pos *= sizeof(reg);
        count *= sizeof(reg);
 
-       return user_regset_copyin_ignore(&pos, &count, &kbuf, &ubuf,
-                                        38 * sizeof(reg), -1);
+       user_regset_copyin_ignore(&pos, &count, &kbuf, &ubuf,
+                                 38 * sizeof(reg), -1);
+       return 0;
 }
 
 static int fpregs32_get(struct task_struct *target,
@@ -737,8 +736,8 @@ static int fpregs32_set(struct task_struct *target,
        task_thread_info(target)->fpsaved[0] = fprs;
 
        if (!ret)
-               ret = user_regset_copyin_ignore(&pos, &count, &kbuf, &ubuf,
-                                               34 * sizeof(u32), -1);
+               user_regset_copyin_ignore(&pos, &count, &kbuf, &ubuf,
+                                         34 * sizeof(u32), -1);
        return ret;
 }