From: Namhyung Kim <namhyung@gmail.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Roland McGrath <roland@redhat.com>,
Oleg Nesterov <oleg@redhat.com>,
linux-kernel@vger.kernel.org,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>
Subject: [PATCH RESEND v3 04/24] ptrace: cleanup arch_ptrace() on x86
Date: Thu, 30 Sep 2010 18:27:39 +0900 [thread overview]
Message-ID: <1285838880-4977-5-git-send-email-namhyung@gmail.com> (raw)
In-Reply-To: <1285838880-4977-1-git-send-email-namhyung@gmail.com>
Remove checking @addr less than 0 because @addr is now unsigned and
use new udescp variable in order to remove unnecessary castings.
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
---
arch/x86/kernel/ptrace.c | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
index 1a7ca04..6167a0c 100644
--- a/arch/x86/kernel/ptrace.c
+++ b/arch/x86/kernel/ptrace.c
@@ -806,6 +806,7 @@ long arch_ptrace(struct task_struct *child, long request,
{
int ret;
unsigned long __user *datap = (unsigned long __user *)data;
+ struct user_desc __user *udescp = (struct user_desc __user *)data;
switch (request) {
/* read the word at location addr in the USER area. */
@@ -813,8 +814,7 @@ long arch_ptrace(struct task_struct *child, long request,
unsigned long tmp;
ret = -EIO;
- if ((addr & (sizeof(data) - 1)) || addr < 0 ||
- addr >= sizeof(struct user))
+ if ((addr & (sizeof(data) - 1)) || addr >= sizeof(struct user))
break;
tmp = 0; /* Default return condition */
@@ -831,8 +831,7 @@ long arch_ptrace(struct task_struct *child, long request,
case PTRACE_POKEUSR: /* write the word at location addr in the USER area */
ret = -EIO;
- if ((addr & (sizeof(data) - 1)) || addr < 0 ||
- addr >= sizeof(struct user))
+ if ((addr & (sizeof(data) - 1)) || addr >= sizeof(struct user))
break;
if (addr < sizeof(struct user_regs_struct))
@@ -891,15 +890,13 @@ long arch_ptrace(struct task_struct *child, long request,
case PTRACE_GET_THREAD_AREA:
if ((int) addr < 0)
return -EIO;
- ret = do_get_thread_area(child, addr,
- (struct user_desc __user *) data);
+ ret = do_get_thread_area(child, addr, udescp);
break;
case PTRACE_SET_THREAD_AREA:
if ((int) addr < 0)
return -EIO;
- ret = do_set_thread_area(child, addr,
- (struct user_desc __user *) data, 0);
+ ret = do_set_thread_area(child, addr, udescp, 0);
break;
#endif
--
1.7.2.2
next prev parent reply other threads:[~2010-09-30 9:28 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-30 9:27 [PATCH RESEND v3 00/24] ptrace cleanups Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 01/24] ptrace: change signature of sys_ptrace() and friends Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 02/24] ptrace: cleanup ptrace_request() Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 03/24] ptrace: change signature of arch_ptrace() Namhyung Kim
2010-09-30 18:58 ` David Miller
2010-10-04 19:21 ` Geert Uytterhoeven
2010-09-30 9:27 ` Namhyung Kim [this message]
2010-09-30 9:27 ` [PATCH RESEND v3 05/24] ptrace: cleanup arch_ptrace() on ARM Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 06/24] ptrace: cleanup arch_ptrace() on avr32 Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 07/24] ptrace: cleanup arch_ptrace() and friends on Blackfin Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 08/24] ptrace: cleanup arch_ptrace() on cris Namhyung Kim
2010-09-30 10:36 ` Mikael Starvik
2010-09-30 9:27 ` [PATCH RESEND v3 09/24] ptrace: cleanup arch_ptrace() on frv Namhyung Kim
2010-10-02 3:18 ` Daniel K.
2010-10-02 3:57 ` Namhyung Kim
2010-10-02 4:59 ` Namhyung Kim
2010-10-02 6:13 ` Daniel K.
2010-09-30 9:27 ` [PATCH RESEND v3 10/24] ptrace: cleanup arch_ptrace() on h8300 Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 11/24] ptrace: cleanup arch_ptrace() on m32r Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 12/24] ptrace: cleanup arch_ptrace() on m68k Namhyung Kim
2010-10-04 19:22 ` Geert Uytterhoeven
2010-09-30 9:27 ` [PATCH RESEND v3 13/24] ptrace: cleanup arch_ptrace() on m68knommu Namhyung Kim
2010-10-04 23:42 ` Andrew Morton
2010-10-05 3:49 ` [PATCH UPDATED] " Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 14/24] ptrace: cleanup arch_ptrace() on microblaze Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 15/24] ptrace: cleanup arch_ptrace() on MIPS Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 16/24] ptrace: cleanup arch_ptrace() on mn10300 Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 17/24] ptrace: cleanup arch_ptrace() on parisc Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 18/24] ptrace: cleanup arch_ptrace() on powerpc Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 19/24] ptrace: cleanup arch_ptrace() on score Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 20/24] ptrace: cleanup arch_ptrace() on sh Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 21/24] ptrace: cleanup arch_ptrace() on sparc Namhyung Kim
2010-09-30 19:00 ` David Miller
2010-09-30 9:27 ` [PATCH RESEND v3 22/24] ptrace: cleanup arch_ptrace() on tile Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 23/24] ptrace: cleanup arch_ptrace() on um Namhyung Kim
2010-09-30 9:27 ` [PATCH RESEND v3 24/24] ptrace: cleanup arch_ptrace() on xtensa 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=1285838880-4977-5-git-send-email-namhyung@gmail.com \
--to=namhyung@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=oleg@redhat.com \
--cc=roland@redhat.com \
--cc=tglx@linutronix.de \
/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