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
Subject: [PATCH v2 02/24] ptrace: cleanup ptrace_request()
Date: Fri, 3 Sep 2010 00:46:09 +0900 [thread overview]
Message-ID: <1283442391-23612-3-git-send-email-namhyung@gmail.com> (raw)
In-Reply-To: <1283442391-23612-1-git-send-email-namhyung@gmail.com>
use new local variable to remove unnecesary casting, but it requires
put_user() to be changed to copy_to_user().
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
---
kernel/ptrace.c | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index f838afe..1084bef 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -563,6 +563,7 @@ int ptrace_request(struct task_struct *child, long request,
{
int ret = -EIO;
siginfo_t siginfo;
+ void __user *datap = (void __user *) data;
switch (request) {
case PTRACE_PEEKTEXT:
@@ -579,19 +580,19 @@ int ptrace_request(struct task_struct *child, long request,
ret = ptrace_setoptions(child, data);
break;
case PTRACE_GETEVENTMSG:
- ret = put_user(child->ptrace_message, (unsigned long __user *) data);
+ ret = copy_to_user(datap, &child->ptrace_message,
+ sizeof (child->ptrace_message)) ?
+ -EFAULT : 0;
break;
case PTRACE_GETSIGINFO:
ret = ptrace_getsiginfo(child, &siginfo);
if (!ret)
- ret = copy_siginfo_to_user((siginfo_t __user *) data,
- &siginfo);
+ ret = copy_siginfo_to_user(datap, &siginfo);
break;
case PTRACE_SETSIGINFO:
- if (copy_from_user(&siginfo, (siginfo_t __user *) data,
- sizeof siginfo))
+ if (copy_from_user(&siginfo, datap, sizeof siginfo))
ret = -EFAULT;
else
ret = ptrace_setsiginfo(child, &siginfo);
@@ -622,7 +623,7 @@ int ptrace_request(struct task_struct *child, long request,
}
mmput(mm);
- ret = put_user(tmp, (unsigned long __user *) data);
+ ret = copy_to_user(datap, &tmp, sizeof tmp) ? -EFAULT : 0;
break;
}
#endif
--
1.7.2.2
next prev parent reply other threads:[~2010-09-02 15:46 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 ` Namhyung Kim [this message]
2010-09-02 18:32 ` [PATCH v2 02/24] ptrace: cleanup ptrace_request() 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 ` [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-3-git-send-email-namhyung@gmail.com \
--to=namhyung@gmail.com \
--cc=arnd@arndb.de \
--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®