From: Namhyung Kim <namhyung@gmail.com>
To: Roland McGrath <roland@redhat.com>,
Oleg Nesterov <oleg@redhat.com>, Arnd Bergmann <arnd@arndb.de>
Cc: linux-kernel@vger.kernel.org, "David S. Miller" <davem@davemloft.net>
Subject: [RFC PATCH 38/43] ptrace, sparc: cleanup arch_ptrace()
Date: Fri, 27 Aug 2010 18:42:24 +0900 [thread overview]
Message-ID: <1282902149-12991-39-git-send-email-namhyung@gmail.com> (raw)
In-Reply-To: <1282902149-12991-1-git-send-email-namhyung@gmail.com>
factor out struct fps and remove redundant castings.
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Cc: "David S. Miller" <davem@davemloft.net>
---
arch/sparc/kernel/ptrace_32.c | 54 +++++++++++++++-------------------------
arch/sparc/kernel/ptrace_64.c | 8 +++---
2 files changed, 24 insertions(+), 38 deletions(-)
diff --git a/arch/sparc/kernel/ptrace_32.c b/arch/sparc/kernel/ptrace_32.c
index e08ba4a..27b9e93 100644
--- a/arch/sparc/kernel/ptrace_32.c
+++ b/arch/sparc/kernel/ptrace_32.c
@@ -323,19 +323,35 @@ const struct user_regset_view *task_user_regset_view(struct task_struct *task)
return &user_sparc32_view;
}
+struct fps {
+ unsigned long regs[32];
+ unsigned long fsr;
+ unsigned long flags;
+ unsigned long extra;
+ unsigned long fpqd;
+ struct fq {
+ unsigned long *insnaddr;
+ unsigned long insn;
+ } fpq[16];
+};
+
long arch_ptrace(struct task_struct *child, long request,
unsigned long addr, unsigned long data)
{
unsigned long addr2 = current->thread.kregs->u_regs[UREG_I4];
+ void __user *addr2p;
const struct user_regset_view *view;
+ struct pt_regs __user *pregs;
+ struct fps __user *fps;
int ret;
view = task_user_regset_view(current);
+ addr2p = (void __user *) addr2;
+ pregs = (struct pt_regs __user *) addr;
+ fps = (struct fps __user *) addr;
switch(request) {
case PTRACE_GETREGS: {
- struct pt_regs __user *pregs = (struct pt_regs __user *) addr;
-
ret = copy_regset_to_user(child, view, REGSET_GENERAL,
32 * sizeof(u32),
4 * sizeof(u32),
@@ -349,8 +365,6 @@ long arch_ptrace(struct task_struct *child, long request,
}
case PTRACE_SETREGS: {
- struct pt_regs __user *pregs = (struct pt_regs __user *) addr;
-
ret = copy_regset_from_user(child, view, REGSET_GENERAL,
32 * sizeof(u32),
4 * sizeof(u32),
@@ -364,19 +378,6 @@ long arch_ptrace(struct task_struct *child, long request,
}
case PTRACE_GETFPREGS: {
- struct fps {
- unsigned long regs[32];
- unsigned long fsr;
- unsigned long flags;
- unsigned long extra;
- unsigned long fpqd;
- struct fq {
- unsigned long *insnaddr;
- unsigned long insn;
- } fpq[16];
- };
- struct fps __user *fps = (struct fps __user *) addr;
-
ret = copy_regset_to_user(child, view, REGSET_FP,
0 * sizeof(u32),
32 * sizeof(u32),
@@ -398,19 +399,6 @@ long arch_ptrace(struct task_struct *child, long request,
}
case PTRACE_SETFPREGS: {
- struct fps {
- unsigned long regs[32];
- unsigned long fsr;
- unsigned long flags;
- unsigned long extra;
- unsigned long fpqd;
- struct fq {
- unsigned long *insnaddr;
- unsigned long insn;
- } fpq[16];
- };
- struct fps __user *fps = (struct fps __user *) addr;
-
ret = copy_regset_from_user(child, view, REGSET_FP,
0 * sizeof(u32),
32 * sizeof(u32),
@@ -425,8 +413,7 @@ long arch_ptrace(struct task_struct *child, long request,
case PTRACE_READTEXT:
case PTRACE_READDATA:
- ret = ptrace_readdata(child, addr,
- (void __user *) addr2, data);
+ ret = ptrace_readdata(child, addr, addr2p, data);
if (ret == data)
ret = 0;
@@ -436,8 +423,7 @@ long arch_ptrace(struct task_struct *child, long request,
case PTRACE_WRITETEXT:
case PTRACE_WRITEDATA:
- ret = ptrace_writedata(child, (void __user *) addr2,
- addr, data);
+ ret = ptrace_writedata(child, addr2p, addr, data);
if (ret == data)
ret = 0;
diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c
index d9db5a4..9ccc812 100644
--- a/arch/sparc/kernel/ptrace_64.c
+++ b/arch/sparc/kernel/ptrace_64.c
@@ -976,10 +976,12 @@ long arch_ptrace(struct task_struct *child, long request,
unsigned long addr2 = task_pt_regs(current)->u_regs[UREG_I4];
struct pt_regs __user *pregs;
struct fps __user *fps;
+ void __user *addr2p;
int ret;
pregs = (struct pt_regs __user *) addr;
fps = (struct fps __user *) addr;
+ addr2p = (void __user *) addr2;
switch (request) {
case PTRACE_PEEKUSR:
@@ -1030,8 +1032,7 @@ long arch_ptrace(struct task_struct *child, long request,
case PTRACE_READTEXT:
case PTRACE_READDATA:
- ret = ptrace_readdata(child, addr,
- (char __user *)addr2, data);
+ ret = ptrace_readdata(child, addr, addr2p, data);
if (ret == data)
ret = 0;
else if (ret >= 0)
@@ -1040,8 +1041,7 @@ long arch_ptrace(struct task_struct *child, long request,
case PTRACE_WRITETEXT:
case PTRACE_WRITEDATA:
- ret = ptrace_writedata(child, (char __user *) addr2,
- addr, data);
+ ret = ptrace_writedata(child, addr2p, addr, data);
if (ret == data)
ret = 0;
else if (ret >= 0)
--
1.7.2.2
next prev parent reply other threads:[~2010-08-27 9:44 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-27 9:41 [RFC PATCH 00/43] ptrace cleanups Namhyung Kim
2010-08-27 9:41 ` [RFC PATCH 01/43] ptrace: change signature of sys_ptrace() and friends Namhyung Kim
2010-08-27 13:21 ` Arnd Bergmann
2010-08-27 15:55 ` Namhyung Kim
2010-08-27 9:41 ` [RFC PATCH 02/43] ptrace: cleanup ptrace_request() Namhyung Kim
2010-08-27 14:23 ` Arnd Bergmann
2010-08-27 16:13 ` Namhyung Kim
2010-08-27 19:26 ` Arnd Bergmann
2010-08-27 9:41 ` [RFC PATCH 03/43] ptrace: change signature of arch_ptrace() Namhyung Kim
2010-08-27 14:28 ` Arnd Bergmann
2010-08-27 16:20 ` Namhyung Kim
2010-08-29 13:40 ` Arnd Bergmann
2010-08-27 9:41 ` [RFC PATCH 04/43] ptrace, x86: " Namhyung Kim
2010-08-27 9:41 ` [RFC PATCH 05/43] ptrace, x86: cleanup arch_ptrace() Namhyung Kim
2010-08-27 9:41 ` [RFC PATCH 06/43] ptrace, alpha: change signature of arch_ptrace() Namhyung Kim
2010-08-27 9:41 ` [RFC PATCH 07/43] ptrace, arm: " Namhyung Kim
2010-08-27 9:41 ` [RFC PATCH 08/43] ptrace, arm: cleanup arch_ptrace() Namhyung Kim
2010-08-27 9:41 ` [RFC PATCH 09/43] ptrace, avr32: change signature of arch_ptrace() Namhyung Kim
2010-08-27 9:41 ` [RFC PATCH 10/43] ptrace, avr32: cleanup arch_ptrace() Namhyung Kim
2010-08-30 12:34 ` Haavard Skinnemoen
2010-08-27 9:41 ` [RFC PATCH 11/43] ptrace, blackfin: change signature of arch_ptrace() Namhyung Kim
2010-08-27 9:41 ` [RFC PATCH 12/43] ptrace, cris-v10: " Namhyung Kim
2010-08-27 9:41 ` [RFC PATCH 13/43] ptrace, cris-v32: " Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 14/43] ptrace, frv: " Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 15/43] ptrace, frv: cleanup arch_ptrace() Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 16/43] ptrace, h8300: change signature of arch_ptrace() Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 17/43] ptrace, h8300: cleanup arch_ptrace() Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 18/43] ptrace, ia64: change signature of arch_ptrace() Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 19/43] ptrace, m32r: " Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 20/43] ptrace, m32r: cleanup arch_ptrace() Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 21/43] ptrace, m68k: change signature of arch_ptrace() Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 22/43] ptrace, m68k: cleanup arch_ptrace() Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 23/43] ptrace, m68knommu: change signature of arch_ptrace() Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 24/43] ptrace, m68knommu: cleanup arch_ptrace() Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 25/43] ptrace, microblaze: change signature of arch_ptrace() Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 26/43] ptrace, mips: " Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 27/43] ptrace, mips: cleanup arch_ptrace() Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 28/43] ptrace, mn10300: change signature of arch_ptrace() Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 29/43] ptrace, mn10300: cleanup arch_ptrace() Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 30/43] ptrace, parisc: change signature of arch_ptrace() Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 31/43] ptrace, powerpc: " Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 32/43] ptrace, powerpc: cleanup arch_ptrace() Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 33/43] ptrace, s390: change signature of arch_ptrace() Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 34/43] ptrace, score: " Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 35/43] ptrace, sh: " Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 36/43] ptrace, sh: cleanup arch_ptrace() Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 37/43] ptrace, sparc: change signature of arch_ptrace() Namhyung Kim
2010-08-27 9:42 ` Namhyung Kim [this message]
2010-08-27 9:42 ` [RFC PATCH 39/43] ptrace, tile: " Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 40/43] ptrace, um: " Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 41/43] ptrace, um: cleanup arch_ptrace() Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 42/43] ptrace, xtensa: change signature of arch_ptrace() Namhyung Kim
2010-08-27 9:42 ` [RFC PATCH 43/43] ptrace, xtensa: cleanup arch_ptrace() Namhyung Kim
2010-08-27 11:01 ` [RFC PATCH 14/43] ptrace, frv: change signature of arch_ptrace() David Howells
2010-08-27 11:15 ` Namhyung Kim
2010-08-27 12:12 ` David Howells
2010-08-27 12:58 ` Namhyung Kim
2010-08-27 13:23 ` David Howells
2010-08-27 15:53 ` Namhyung Kim
2010-08-27 16:30 ` [RFC PATCH 00/43] ptrace cleanups Mike Frysinger
2010-08-30 0:14 ` Roland McGrath
2010-08-30 14:02 ` Namhyung Kim
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=1282902149-12991-39-git-send-email-namhyung@gmail.com \
--to=namhyung@gmail.com \
--cc=arnd@arndb.de \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=oleg@redhat.com \
--cc=roland@redhat.com \
/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
all inboxes | Powered by JetHome®