From: Namhyung Kim <namhyung@gmail.com>
To: Roland McGrath <roland@redhat.com>, Oleg Nesterov <oleg@redhat.com>
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH 2/3] ptrace: add __force markup
Date: Sun, 22 Aug 2010 19:22:15 +0900 [thread overview]
Message-ID: <1282472536-7430-2-git-send-email-namhyung@gmail.com> (raw)
casting from kernel address space to user needs __force markup. Add it.
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 4afd9b8..1abbb4d 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -580,18 +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 = put_user(child->ptrace_message,
+ (unsigned long __user __force *) data);
break;
case PTRACE_GETSIGINFO:
ret = ptrace_getsiginfo(child, &siginfo);
if (!ret)
- ret = copy_siginfo_to_user((siginfo_t __user *) data,
+ ret = copy_siginfo_to_user((siginfo_t __user __force *) data,
&siginfo);
break;
case PTRACE_SETSIGINFO:
- if (copy_from_user(&siginfo, (siginfo_t __user *) data,
+ if (copy_from_user(&siginfo, (siginfo_t __user __force *) data,
sizeof siginfo))
ret = -EFAULT;
else
@@ -623,7 +624,7 @@ int ptrace_request(struct task_struct *child, long request,
}
mmput(mm);
- ret = put_user(tmp, (unsigned long __user *) data);
+ ret = put_user(tmp, (unsigned long __user __force *) data);
break;
}
#endif
@@ -652,7 +653,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 = (struct iovec __user __force *) data;
if (!access_ok(VERIFY_WRITE, uiov, sizeof(*uiov)))
return -EFAULT;
@@ -742,7 +743,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, long addr, long data)
copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
if (copied != sizeof(tmp))
return -EIO;
- return put_user(tmp, (unsigned long __user *)data);
+ return put_user(tmp, (unsigned long __user __force *)data);
}
int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data)
--
1.7.0.4
next reply other threads:[~2010-08-22 10:22 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-22 10:22 Namhyung Kim [this message]
2010-08-22 20:06 ` Arnd Bergmann
2010-08-23 16:06 ` [PATCH 2/3 RESEND] ptrace: cleanup address space conversion on ptrace_request() Namhyung Kim
2010-08-23 16:21 ` Christoph Hellwig
2010-08-23 16:38 ` Namhyung Kim
2010-08-24 11:45 ` Arnd Bergmann
2010-08-25 7:48 ` Namhyung Kim
2010-08-25 11:42 ` Arnd Bergmann
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=1282472536-7430-2-git-send-email-namhyung@gmail.com \
--to=namhyung@gmail.com \
--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
Powered by JetHome