public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
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
Subject: [PATCH RESEND v3 02/24] ptrace: cleanup ptrace_request()
Date: Thu, 30 Sep 2010 18:27:37 +0900	[thread overview]
Message-ID: <1285838880-4977-3-git-send-email-namhyung@gmail.com> (raw)
In-Reply-To: <1285838880-4977-1-git-send-email-namhyung@gmail.com>

Use new 'datavp' and 'datalp' variables to remove unnecesary castings.

Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Acked-by: Roland McGrath <roland@redhat.com>
---
 kernel/ptrace.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index f838afe..dded1d6 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -563,6 +563,8 @@ int ptrace_request(struct task_struct *child, long request,
 {
 	int ret = -EIO;
 	siginfo_t siginfo;
+	void __user *datavp = (void __user *) data;
+	unsigned long __user *datalp = datavp;
 
 	switch (request) {
 	case PTRACE_PEEKTEXT:
@@ -579,19 +581,17 @@ 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 = put_user(child->ptrace_message, datalp);
 		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(datavp, &siginfo);
 		break;
 
 	case PTRACE_SETSIGINFO:
-		if (copy_from_user(&siginfo, (siginfo_t __user *) data,
-				   sizeof siginfo))
+		if (copy_from_user(&siginfo, datavp, sizeof siginfo))
 			ret = -EFAULT;
 		else
 			ret = ptrace_setsiginfo(child, &siginfo);
@@ -622,7 +622,7 @@ int ptrace_request(struct task_struct *child, long request,
 		}
 		mmput(mm);
 
-		ret = put_user(tmp, (unsigned long __user *) data);
+		ret = put_user(tmp, datalp);
 		break;
 	}
 #endif
@@ -651,7 +651,7 @@ int ptrace_request(struct task_struct *child, long request,
 	case PTRACE_SETREGSET:
 	{
 		struct iovec kiov;
-		struct iovec __user *uiov = (struct iovec __user *) data;
+		struct iovec __user *uiov = datavp;
 
 		if (!access_ok(VERIFY_WRITE, uiov, sizeof(*uiov)))
 			return -EFAULT;
-- 
1.7.2.2


  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 ` Namhyung Kim [this message]
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 ` [PATCH RESEND v3 04/24] ptrace: cleanup arch_ptrace() on x86 Namhyung Kim
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-3-git-send-email-namhyung@gmail.com \
    --to=namhyung@gmail.com \
    --cc=akpm@linux-foundation.org \
    --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