lkml.org 
[lkml]   [2020]   [Jun]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 055/265] fix a braino in "sparc32: fix register window handling in genregs32_[gs]et()"
    Date
    From: Al Viro <viro@zeniv.linux.org.uk>

    [ Upstream commit 9d964e1b82d8182184153b70174f445ea616f053 ]

    lost npc in PTRACE_SETREGSET, breaking PTRACE_SETREGS as well

    Fixes: cf51e129b968 "sparc32: fix register window handling in genregs32_[gs]et()"
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/sparc/kernel/ptrace_32.c | 9 +++++++--
    1 file changed, 7 insertions(+), 2 deletions(-)

    diff --git a/arch/sparc/kernel/ptrace_32.c b/arch/sparc/kernel/ptrace_32.c
    index 60f7205ebe40d..646dd58169ecb 100644
    --- a/arch/sparc/kernel/ptrace_32.c
    +++ b/arch/sparc/kernel/ptrace_32.c
    @@ -168,12 +168,17 @@ static int genregs32_set(struct task_struct *target,
    if (ret || !count)
    return ret;
    ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,
    - &regs->y,
    + &regs->npc,
    34 * sizeof(u32), 35 * sizeof(u32));
    if (ret || !count)
    return ret;
    + ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,
    + &regs->y,
    + 35 * sizeof(u32), 36 * sizeof(u32));
    + if (ret || !count)
    + return ret;
    return user_regset_copyin_ignore(&pos, &count, &kbuf, &ubuf,
    - 35 * sizeof(u32), 38 * sizeof(u32));
    + 36 * sizeof(u32), 38 * sizeof(u32));
    }

    static int fpregs32_get(struct task_struct *target,
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-30 00:03    [W:4.067 / U:1.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site