From: Namhyung Kim <namhyung@gmail.com>
To: Roland McGrath <roland@redhat.com>, Oleg Nesterov <oleg@redhat.com>
Cc: Arnd Bergmann <arnd@arndb.de>,
linux-kernel@vger.kernel.org,
"David S. Miller" <davem@davemloft.net>
Subject: [PATCH v2 21/24] ptrace: cleanup arch_ptrace() on sparc
Date: Fri, 3 Sep 2010 00:46:28 +0900 [thread overview]
Message-ID: <1283442391-23612-22-git-send-email-namhyung@gmail.com> (raw)
In-Reply-To: <1283442391-23612-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-09-02 15:48 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-02 15:46 [PATCH v2 00/24] ptrace cleanups Namhyung Kim
2010-09-02 15:46 ` [PATCH v2 01/24] ptrace: change signature of sys_ptrace() and friends Namhyung Kim
2010-09-02 15:46 ` [PATCH v2 02/24] ptrace: cleanup ptrace_request() Namhyung Kim
2010-09-02 18:32 ` Roland McGrath
2010-09-03 3:19 ` Namhyung Kim
2010-09-02 15:46 ` [PATCH v2 03/24] ptrace: change signature of arch_ptrace() Namhyung Kim
2010-09-02 15:46 ` [PATCH v2 04/24] ptrace: cleanup arch_ptrace() on x86 Namhyung Kim
2010-09-02 15:46 ` [PATCH v2 05/24] ptrace: cleanup arch_ptrace() on ARM Namhyung Kim
2010-09-02 15:46 ` [PATCH v2 06/24] ptrace: cleanup arch_ptrace() on avr32 Namhyung Kim
2010-09-02 15:46 ` [PATCH v2 07/24] ptrace: cleanup arch_ptrace() and friends on Blackfin Namhyung Kim
2010-09-02 17:48 ` Mike Frysinger
2010-09-02 15:46 ` [PATCH v2 08/24] ptrace: cleanup arch_ptrace() on cris Namhyung Kim
2010-09-02 15:46 ` [PATCH v2 09/24] ptrace: cleanup arch_ptrace() on frv Namhyung Kim
2010-09-02 15:46 ` [PATCH v2 10/24] ptrace: cleanup arch_ptrace() on h8300 Namhyung Kim
2010-09-02 15:46 ` [PATCH v2 11/24] ptrace: cleanup arch_ptrace() on m32r Namhyung Kim
2010-09-02 15:46 ` [PATCH v2 12/24] ptrace: cleanup arch_ptrace() on m68k Namhyung Kim
2010-09-02 15:46 ` [PATCH v2 13/24] ptrace: cleanup arch_ptrace() on m68knommu Namhyung Kim
2010-09-07 5:54 ` Greg Ungerer
2010-09-02 15:46 ` [PATCH v2 14/24] ptrace: cleanup arch_ptrace() on microblaze Namhyung Kim
[not found] ` <4C8DCF72.4050701@monstr.eu>
2010-09-13 10:07 ` Namhyung Kim
2010-09-14 2:15 ` Roland McGrath
2010-09-14 2:27 ` Namhyung Kim
2010-09-14 2:31 ` Roland McGrath
2010-09-14 2:39 ` Namhyung Kim
2010-09-14 2:58 ` Roland McGrath
2010-09-02 15:46 ` [PATCH v2 15/24] ptrace: cleanup arch_ptrace() on MIPS Namhyung Kim
2010-09-02 15:46 ` [PATCH v2 16/24] ptrace: cleanup arch_ptrace() on mn10300 Namhyung Kim
2010-09-02 15:46 ` [PATCH v2 17/24] ptrace: cleanup arch_ptrace() on parisc Namhyung Kim
2010-09-02 15:46 ` [PATCH v2 18/24] ptrace: cleanup arch_ptrace() on powerpc Namhyung Kim
2010-09-02 15:46 ` [PATCH v2 19/24] ptrace: cleanup arch_ptrace() on score Namhyung Kim
2010-09-02 15:46 ` [PATCH v2 20/24] ptrace: cleanup arch_ptrace() on sh Namhyung Kim
2010-09-02 15:46 ` Namhyung Kim [this message]
2010-09-02 15:46 ` [PATCH v2 22/24] ptrace: cleanup arch_ptrace() on tile Namhyung Kim
2010-09-02 16:35 ` Chris Metcalf
2010-09-02 16:55 ` Namhyung Kim
2010-09-02 17:13 ` Chris Metcalf
2010-09-02 15:46 ` [PATCH v2 23/24] ptrace: cleanup arch_ptrace() on um Namhyung Kim
2010-09-02 15:46 ` [PATCH v2 24/24] ptrace: cleanup arch_ptrace() on xtensa Namhyung Kim
2010-09-03 7:40 ` [PATCH v2 03/24] ptrace: change signature of arch_ptrace() David Howells
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=1283442391-23612-22-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®