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, Mikael Starvik <starvik@axis.com>,
Jesper Nilsson <jesper.nilsson@axis.com>
Subject: [PATCH v2 08/24] ptrace: cleanup arch_ptrace() on cris
Date: Fri, 3 Sep 2010 00:46:15 +0900 [thread overview]
Message-ID: <1283442391-23612-9-git-send-email-namhyung@gmail.com> (raw)
In-Reply-To: <1283442391-23612-1-git-send-email-namhyung@gmail.com>
Use new 'regno' variable in order to remove redandunt expression and
remove checking @addr less than 0 because @addr is now unsigned.
Also update 'datap' on PTRACE_GET/SETREGS to fix a bug on arch-v10.
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
---
arch/cris/arch-v10/kernel/ptrace.c | 17 ++++++++---------
arch/cris/arch-v32/kernel/ptrace.c | 13 ++++++-------
2 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/arch/cris/arch-v10/kernel/ptrace.c b/arch/cris/arch-v10/kernel/ptrace.c
index d411e02..320065f 100644
--- a/arch/cris/arch-v10/kernel/ptrace.c
+++ b/arch/cris/arch-v10/kernel/ptrace.c
@@ -80,6 +80,7 @@ long arch_ptrace(struct task_struct *child, long request,
unsigned long addr, unsigned long data)
{
int ret;
+ unsigned int regno = addr >> 2;
unsigned long __user *datap = (unsigned long __user *)data;
switch (request) {
@@ -94,10 +95,10 @@ long arch_ptrace(struct task_struct *child, long request,
unsigned long tmp;
ret = -EIO;
- if ((addr & 3) || addr < 0 || addr > PT_MAX << 2)
+ if ((addr & 3) || regno > PT_MAX)
break;
- tmp = get_reg(child, addr >> 2);
+ tmp = get_reg(child, regno);
ret = put_user(tmp, datap);
break;
}
@@ -111,19 +112,17 @@ long arch_ptrace(struct task_struct *child, long request,
/* Write the word at location address in the USER area. */
case PTRACE_POKEUSR:
ret = -EIO;
- if ((addr & 3) || addr < 0 || addr > PT_MAX << 2)
+ if ((addr & 3) || regno > PT_MAX)
break;
- addr >>= 2;
-
- if (addr == PT_DCCR) {
+ if (regno == PT_DCCR) {
/* don't allow the tracing process to change stuff like
* interrupt enable, kernel/user bit, dma enables etc.
*/
data &= DCCR_MASK;
data |= get_reg(child, PT_DCCR) & ~DCCR_MASK;
}
- if (put_reg(child, addr, data))
+ if (put_reg(child, regno, data))
break;
ret = 0;
break;
@@ -142,7 +141,7 @@ long arch_ptrace(struct task_struct *child, long request,
break;
}
- data += sizeof(unsigned long);
+ datap++;
}
break;
@@ -166,7 +165,7 @@ long arch_ptrace(struct task_struct *child, long request,
}
put_reg(child, i, tmp);
- data += sizeof(unsigned long);
+ datap++;
}
break;
diff --git a/arch/cris/arch-v32/kernel/ptrace.c b/arch/cris/arch-v32/kernel/ptrace.c
index 3e058a1..511ece9 100644
--- a/arch/cris/arch-v32/kernel/ptrace.c
+++ b/arch/cris/arch-v32/kernel/ptrace.c
@@ -130,6 +130,7 @@ long arch_ptrace(struct task_struct *child, long request,
unsigned long addr, unsigned long data)
{
int ret;
+ unsigned int regno = addr >> 2;
unsigned long __user *datap = (unsigned long __user *)data;
switch (request) {
@@ -164,10 +165,10 @@ long arch_ptrace(struct task_struct *child, long request,
unsigned long tmp;
ret = -EIO;
- if ((addr & 3) || addr < 0 || addr > PT_MAX << 2)
+ if ((addr & 3) || regno > PT_MAX)
break;
- tmp = get_reg(child, addr >> 2);
+ tmp = get_reg(child, regno);
ret = put_user(tmp, datap);
break;
}
@@ -181,19 +182,17 @@ long arch_ptrace(struct task_struct *child, long request,
/* Write the word at location address in the USER area. */
case PTRACE_POKEUSR:
ret = -EIO;
- if ((addr & 3) || addr < 0 || addr > PT_MAX << 2)
+ if ((addr & 3) || regno > PT_MAX)
break;
- addr >>= 2;
-
- if (addr == PT_CCS) {
+ if (regno == PT_CCS) {
/* don't allow the tracing process to change stuff like
* interrupt enable, kernel/user bit, dma enables etc.
*/
data &= CCS_MASK;
data |= get_reg(child, PT_CCS) & ~CCS_MASK;
}
- if (put_reg(child, addr, data))
+ if (put_reg(child, regno, data))
break;
ret = 0;
break;
--
1.7.2.2
next prev parent reply other threads:[~2010-09-02 15:47 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 ` Namhyung Kim [this message]
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 ` [PATCH v2 21/24] ptrace: cleanup arch_ptrace() on sparc Namhyung Kim
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-9-git-send-email-namhyung@gmail.com \
--to=namhyung@gmail.com \
--cc=arnd@arndb.de \
--cc=jesper.nilsson@axis.com \
--cc=linux-kernel@vger.kernel.org \
--cc=oleg@redhat.com \
--cc=roland@redhat.com \
--cc=starvik@axis.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®