From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758055AbZEKN1f (ORCPT ); Mon, 11 May 2009 09:27:35 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753755AbZEKN1J (ORCPT ); Mon, 11 May 2009 09:27:09 -0400 Received: from mail-bw0-f174.google.com ([209.85.218.174]:55686 "EHLO mail-bw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751392AbZEKN1H (ORCPT ); Mon, 11 May 2009 09:27:07 -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=GPmSCVoscIIwlTO17vuqWM8Jf7A1OGH7QWLjNzb4i5tdoTQcsR3ESdP1ZUTurD3zbm keTqbsS3kB+EZsxZ5KKNHjJVMlVfHyDO2J+gVFhrs2MCrrfoEPs20R2rLwKoLlxFXjM8 LeXfG56Fbp7akOlfhaZNKPnkeH2Xciv4/S+wg= From: Vitaly Mayatskikh To: Andrew Morton Cc: Oleg Nesterov , Ingo Molnar , Roland McGrath , linux-kernel@vger.kernel.org Subject: [PATCH 2/5] Use copy_wait_opts_to_user() in wait_task_stopped() Date: Mon, 11 May 2009 15:25:51 +0200 Message-Id: <1242048349-2766-3-git-send-email-v.mayatskih@gmail.com> X-Mailer: git-send-email 1.6.2.2 In-Reply-To: <1242048349-2766-1-git-send-email-v.mayatskih@gmail.com> References: <1242048349-2766-1-git-send-email-v.mayatskih@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org All copy-paste getrusage() and put_user() code in wait_task_* functions is replaced by call to copy_wait_opts_to_user() Also, there's no reason to have two almost similar branches of copy out in wait_task_stopped(). The later branch also puts stat_addr to user, but it can't affect WNOWAIT flag, and it's ok to merge both branches. Signed-off-by: Vitaly Mayatskikh --- kernel/exit.c | 20 +------------------- 1 files changed, 1 insertions(+), 19 deletions(-) diff --git a/kernel/exit.c b/kernel/exit.c index 9546362..0bf2d3c 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -1345,7 +1345,6 @@ static int *task_stopped_code(struct task_struct *p, bool ptrace) static int wait_task_stopped(struct wait_opts *wo, int ptrace, struct task_struct *p) { - struct siginfo __user *infop; int retval, exit_code, *p_code, why; uid_t uid = 0; /* unneeded, required by compiler */ pid_t pid; @@ -1389,27 +1388,10 @@ unlock_sig: why = ptrace ? CLD_TRAPPED : CLD_STOPPED; read_unlock(&tasklist_lock); - if (unlikely(wo->wo_flags & WNOWAIT)) - return wait_noreap_copyout(wo, p, pid, uid, why, exit_code); + retval = copy_wait_opts_to_user(wo, p, pid, uid, why, exit_code, SIGCHLD); - retval = wo->wo_rusage - ? getrusage(p, RUSAGE_BOTH, wo->wo_rusage) : 0; if (!retval && wo->wo_stat) retval = put_user((exit_code << 8) | 0x7f, wo->wo_stat); - - infop = wo->wo_info; - if (!retval && infop) - retval = put_user(SIGCHLD, &infop->si_signo); - if (!retval && infop) - retval = put_user(0, &infop->si_errno); - if (!retval && infop) - retval = put_user((short)why, &infop->si_code); - if (!retval && infop) - retval = put_user(exit_code, &infop->si_status); - if (!retval && infop) - retval = put_user(pid, &infop->si_pid); - if (!retval && infop) - retval = put_user(uid, &infop->si_uid); if (!retval) retval = pid; put_task_struct(p); -- 1.6.2.2