lkml.org 
[lkml]   [2022]   [Oct]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 12/13] sparc: ptrace: user_regset_copyin_ignore() always returns 0
    Date
    user_regset_copyin_ignore() always returns 0, so checking its result seems
    pointless -- don't do this anymore...

    Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru>
    ---
    arch/sparc/kernel/ptrace_32.c | 9 +++++----
    arch/sparc/kernel/ptrace_64.c | 23 +++++++++++------------
    2 files changed, 16 insertions(+), 16 deletions(-)

    diff --git a/arch/sparc/kernel/ptrace_32.c b/arch/sparc/kernel/ptrace_32.c
    index e7db48acb838..c273ccebea46 100644
    --- 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 86a7eb5c27ba..4deba5b6eddb 100644
    --- 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 @@ static int genregs32_set(struct task_struct *target,
    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;
    }

    --
    2.26.3
    \
     
     \ /
      Last update: 2022-10-14 23:25    [W:2.711 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site