From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755924Ab0IBPq4 (ORCPT ); Thu, 2 Sep 2010 11:46:56 -0400 Received: from mail-iw0-f174.google.com ([209.85.214.174]:44333 "EHLO mail-iw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755899Ab0IBPqx (ORCPT ); Thu, 2 Sep 2010 11:46:53 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=ULD1lNOZHgM5gEK2E7H/a+4bPI5jvuTUyIWHuc/dxNFGmtODJfwZ/Cl/IAaU5ZpVtu MOBTna9oTchGqB3TxGuQl4CIKwGX80nwOba4RlLbT21wOP47Hg0LgCbp1o8DAOlS7OsN 9cfUBvDqESLM52KGsGlbLgjxkQeXVaCBMQTxc= From: Namhyung Kim To: Roland McGrath , Oleg Nesterov Cc: Arnd Bergmann , linux-kernel@vger.kernel.org Subject: [PATCH v2 02/24] ptrace: cleanup ptrace_request() Date: Fri, 3 Sep 2010 00:46:09 +0900 Message-Id: <1283442391-23612-3-git-send-email-namhyung@gmail.com> X-Mailer: git-send-email 1.7.2.2 In-Reply-To: <1283442391-23612-1-git-send-email-namhyung@gmail.com> References: <1283442391-23612-1-git-send-email-namhyung@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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