2020-05-31 01:08:23

by Al Viro

Subject: [git pull] a couple of sparc ptrace fixes

The following changes since commit 8f3d9f354286745c751374f5f1fcafee6b3f3136:

Linux 5.7-rc1 (2020-04-12 12:35:55 -0700)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git for-davem

for you to fetch changes up to cf51e129b96847f969bfb8af1ee1516a01a70b39:

sparc32: fix register window handling in genregs32_[gs]et() (2020-05-20 13:29:37 -0400)

----------------------------------------------------------------
Al Viro (2):
sparc64: fix misuses of access_process_vm() in genregs32_[sg]et()
sparc32: fix register window handling in genregs32_[gs]et()

arch/sparc/kernel/ptrace_32.c | 228 ++++++++++++++++++------------------------
arch/sparc/kernel/ptrace_64.c | 17 +---
2 files changed, 101 insertions(+), 144 deletions(-)

2020-06-03 01:49:37

by David Miller

Subject: Re: [git pull] a couple of sparc ptrace fixes

From: Al Viro <[email protected]>
Date: Sun, 31 May 2020 02:04:14 +0100

> The following changes since commit 8f3d9f354286745c751374f5f1fcafee6b3f3136:
>
> Linux 5.7-rc1 (2020-04-12 12:35:55 -0700)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git for-davem

Pulled, thanks Al.

2020-06-07 14:45:12

by Al Viro

Subject: Re: [git pull] a couple of sparc ptrace fixes

On Sun, May 31, 2020 at 02:04:14AM +0100, Al Viro wrote:
> The following changes since commit 8f3d9f354286745c751374f5f1fcafee6b3f3136:
>
> Linux 5.7-rc1 (2020-04-12 12:35:55 -0700)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git for-davem
>
> for you to fetch changes up to cf51e129b96847f969bfb8af1ee1516a01a70b39:
>
> sparc32: fix register window handling in genregs32_[gs]et() (2020-05-20 13:29:37 -0400)
>
> ----------------------------------------------------------------
> Al Viro (2):
> sparc64: fix misuses of access_process_vm() in genregs32_[sg]et()
> sparc32: fix register window handling in genregs32_[gs]et()
>
> arch/sparc/kernel/ptrace_32.c | 228 ++++++++++++++++++------------------------
> arch/sparc/kernel/ptrace_64.c | 17 +---
> 2 files changed, 101 insertions(+), 144 deletions(-)

Grrr...

sparc32 fix had breakage of its own; I've pushed a fix into #for-davem. Fixup
follows. Could you pull it?

commit 9d964e1b82d8182184153b70174f445ea616f053
Author: Al Viro <[email protected]>
Date: Sat Jun 6 23:44:24 2020 -0400

fix a braino in "sparc32: fix register window handling in genregs32_[gs]et()"

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 <[email protected]>

diff --git a/arch/sparc/kernel/ptrace_32.c b/arch/sparc/kernel/ptrace_32.c
index 60f7205ebe40..646dd58169ec 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,

2020-06-07 23:42:38

by David Miller

Subject: Re: [git pull] a couple of sparc ptrace fixes

From: Al Viro <[email protected]>
Date: Sun, 7 Jun 2020 15:41:52 +0100

> On Sun, May 31, 2020 at 02:04:14AM +0100, Al Viro wrote:
>> The following changes since commit 8f3d9f354286745c751374f5f1fcafee6b3f3136:
>>
>> Linux 5.7-rc1 (2020-04-12 12:35:55 -0700)
>>
>> are available in the git repository at:
>>
>> git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git for-davem
>>
>> for you to fetch changes up to cf51e129b96847f969bfb8af1ee1516a01a70b39:
>>
>> sparc32: fix register window handling in genregs32_[gs]et() (2020-05-20 13:29:37 -0400)
>>
>> ----------------------------------------------------------------
>> Al Viro (2):
>> sparc64: fix misuses of access_process_vm() in genregs32_[sg]et()
>> sparc32: fix register window handling in genregs32_[gs]et()
>>
>> arch/sparc/kernel/ptrace_32.c | 228 ++++++++++++++++++------------------------
>> arch/sparc/kernel/ptrace_64.c | 17 +---
>> 2 files changed, 101 insertions(+), 144 deletions(-)
>
> Grrr...
>
> sparc32 fix had breakage of its own; I've pushed a fix into #for-davem. Fixup
> follows. Could you pull it?

Done.