From: Al Viro <viro@ZenIV.linux.org.uk>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org,
David Miller <davem@davemloft.net>,
Tony Luck <tony.luck@intel.com>, Will Deacon <will@kernel.org>
Subject: [PATCH 09/41] sparc64: switch genregs32_get() to use of get_from_target()
Date: Mon, 29 Jun 2020 19:25:56 +0100 [thread overview]
Message-ID: <20200629182628.529995-9-viro@ZenIV.linux.org.uk> (raw)
In-Reply-To: <20200629182628.529995-1-viro@ZenIV.linux.org.uk>
From: Al Viro <viro@zeniv.linux.org.uk>
... for fetching the register window from target's stack, rather
than open-coding it.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
arch/sparc/kernel/ptrace_64.c | 59 ++++++++++++-------------------------------
1 file changed, 16 insertions(+), 43 deletions(-)
diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c
index 7122efb4b1cc..f7b2ddfc81d6 100644
--- a/arch/sparc/kernel/ptrace_64.c
+++ b/arch/sparc/kernel/ptrace_64.c
@@ -518,10 +518,10 @@ static int genregs32_get(struct task_struct *target,
void *kbuf, void __user *ubuf)
{
const struct pt_regs *regs = task_pt_regs(target);
- compat_ulong_t __user *reg_window;
compat_ulong_t *k = kbuf;
compat_ulong_t __user *u = ubuf;
- compat_ulong_t reg;
+ u32 uregs[16];
+ u32 reg;
if (target == current)
flushw_user();
@@ -533,52 +533,25 @@ static int genregs32_get(struct task_struct *target,
for (; count > 0 && pos < 16; count--)
*k++ = regs->u_regs[pos++];
- reg_window = (compat_ulong_t __user *) regs->u_regs[UREG_I6];
- reg_window -= 16;
- if (target == current) {
- for (; count > 0 && pos < 32; count--) {
- if (get_user(*k++, ®_window[pos++]))
- return -EFAULT;
- }
- } else {
- for (; count > 0 && pos < 32; count--) {
- if (access_process_vm(target,
- (unsigned long)
- ®_window[pos],
- k, sizeof(*k),
- FOLL_FORCE)
- != sizeof(*k))
- return -EFAULT;
- k++;
- pos++;
- }
+ if (count && pos < 32) {
+ if (get_from_target(target, regs->u_regs[UREG_I6],
+ uregs, sizeof(uregs)))
+ return -EFAULT;
+ for (; count > 0 && pos < 32; count--)
+ *k++ = uregs[pos++ - 16];
+
}
} else {
- for (; count > 0 && pos < 16; count--) {
+ for (; count > 0 && pos < 16; count--)
if (put_user((compat_ulong_t) regs->u_regs[pos++], u++))
return -EFAULT;
- }
-
- reg_window = (compat_ulong_t __user *) regs->u_regs[UREG_I6];
- reg_window -= 16;
- if (target == current) {
- for (; count > 0 && pos < 32; count--) {
- if (get_user(reg, ®_window[pos++]) ||
- put_user(reg, u++))
- return -EFAULT;
- }
- } else {
- for (; count > 0 && pos < 32; count--) {
- if (access_process_vm(target,
- (unsigned long)
- ®_window[pos++],
- ®, sizeof(reg),
- FOLL_FORCE)
- != sizeof(reg))
- return -EFAULT;
- if (put_user(reg, u++))
+ if (count && pos < 32) {
+ if (get_from_target(target, regs->u_regs[UREG_I6],
+ uregs, sizeof(uregs)))
+ return -EFAULT;
+ for (; count > 0 && pos < 32; count--)
+ if (put_user(uregs[pos++ - 16], u++))
return -EFAULT;
- }
}
}
while (count > 0) {
--
2.11.0
next prev parent reply other threads:[~2020-06-29 18:49 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-29 18:23 [RFC][PATCHSET] regset ->get() rework Al Viro
2020-06-29 18:25 ` [PATCH 01/41] introduction of regset ->get() wrappers, switching ELF coredumps to those Al Viro
2020-06-29 18:25 ` [PATCH 02/41] x86: copy_fpstate_to_sigframe(): have fpregs_soft_get() use kernel buffer Al Viro
2020-06-29 18:25 ` [PATCH 03/41] x86: kill dump_fpu() Al Viro
2020-06-29 18:25 ` [PATCH 04/41] [ia64] sanitize elf_access_gpreg() Al Viro
2020-06-29 18:25 ` [PATCH 05/41] [ia64] teach elf_access_reg() to handle the missing range (r16..r31) Al Viro
2020-06-29 18:25 ` [PATCH 06/41] [ia64] regularize do_gpregs_[gs]et() Al Viro
2020-06-29 18:25 ` [PATCH 07/41] [ia64] access_uarea(): stop bothering with gpregs_[gs]et() Al Viro
2020-06-29 18:25 ` [PATCH 08/41] [ia64] access_uarea(): don't bother with fpregs_[gs]et() Al Viro
2020-06-29 18:25 ` Al Viro [this message]
2020-06-29 18:25 ` [PATCH 10/41] sparc32: get rid of odd callers of copy_regset_to_user() Al Viro
2020-06-29 18:25 ` [PATCH 11/41] sparc64: " Al Viro
2020-06-29 18:25 ` [PATCH 12/41] sparc32: get rid of odd callers of copy_regset_from_user() Al Viro
2020-06-29 18:26 ` [PATCH 13/41] sparc64: " Al Viro
2020-06-29 18:26 ` [PATCH 14/41] arm64: take fetching compat reg out of pt_regs into a new helper Al Viro
2020-06-29 18:26 ` [PATCH 15/41] arm64: get rid of copy_regset_to_user() in compat_ptrace_read_user() Al Viro
2020-06-29 18:26 ` [PATCH 16/41] arm64: sanitize compat_ptrace_write_user() Al Viro
2020-06-29 18:26 ` [PATCH 17/41] copy_regset_to_user(): do all copyout at once Al Viro
2020-06-29 18:26 ` [PATCH 18/41] regset: new method and helpers for it Al Viro
2020-06-29 19:23 ` Linus Torvalds
2020-06-29 20:30 ` Al Viro
2020-06-30 13:25 ` Al Viro
2020-06-30 16:53 ` Linus Torvalds
2020-06-30 19:40 ` Al Viro
2020-06-29 18:26 ` [PATCH 19/41] x86: switch to ->get2() Al Viro
2020-06-29 18:26 ` [PATCH 20/41] powerpc: " Al Viro
2020-06-29 18:26 ` [PATCH 21/41] s390: " Al Viro
2020-06-29 18:26 ` [PATCH 22/41] sparc: " Al Viro
2020-06-30 13:16 ` Al Viro
2020-06-29 18:26 ` [PATCH 23/41] mips: " Al Viro
2020-06-29 18:26 ` [PATCH 24/41] arm64: " Al Viro
2020-06-29 18:26 ` [PATCH 25/41] sh: convert " Al Viro
2020-06-29 18:26 ` [PATCH 26/41] arm: switch " Al Viro
2020-06-29 18:26 ` [PATCH 27/41] arc: " Al Viro
2020-06-29 18:26 ` [PATCH 28/41] ia64: " Al Viro
2020-06-29 18:26 ` [PATCH 29/41] c6x: " Al Viro
2020-06-29 18:26 ` [PATCH 30/41] riscv: " Al Viro
2020-06-29 18:26 ` [PATCH 31/41] openrisc: " Al Viro
2020-06-29 18:26 ` [PATCH 32/41] h8300: " Al Viro
2020-06-29 18:26 ` [PATCH 33/41] hexagon: " Al Viro
2020-08-11 18:35 ` Brian Cain
2020-06-29 18:26 ` [PATCH 34/41] nios2: " Al Viro
2020-06-29 18:26 ` [PATCH 35/41] nds32: " Al Viro
2020-06-29 18:26 ` [PATCH 36/41] parisc: " Al Viro
2020-06-29 18:26 ` [PATCH 37/41] xtensa: " Al Viro
2020-06-29 18:26 ` [PATCH 38/41] csky: " Al Viro
2020-06-29 18:26 ` [PATCH 39/41] regset: kill ->get() Al Viro
2020-06-29 18:26 ` [PATCH 40/41] regset(): kill ->get_size() Al Viro
2020-06-29 18:26 ` [PATCH 41/41] regset: kill user_regset_copyout{,_zero}() Al Viro
2020-07-23 8:00 ` [RFC][PATCHSET] regset ->get() rework Christoph Hellwig
2020-07-23 17:27 ` Al Viro
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200629182628.529995-9-viro@ZenIV.linux.org.uk \
--to=viro@zeniv.linux.org.uk \
--cc=davem@davemloft.net \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tony.luck@intel.com \
--cc=torvalds@linux-foundation.org \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).