From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757895AbZEKN2c (ORCPT ); Mon, 11 May 2009 09:28:32 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755949AbZEKN1M (ORCPT ); Mon, 11 May 2009 09:27:12 -0400 Received: from fg-out-1718.google.com ([72.14.220.156]:15094 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751318AbZEKN1J (ORCPT ); Mon, 11 May 2009 09:27:09 -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=EtJEy9fkSUUj6gXrlT6SJFtLyv/heN74ZpL7fJeN2/ivUpfq5CJdWMRCCGuvukrVwr 2vSrY6Lt9FPEv3j257sMiUWVrJ+QwYsFSWxDQagFC4w+M0c4BRrORx5yWBV9QUXXFTUL xQdx8UIcuSCW3XiV1uo9aBbe6n2Al6UF0B+es= From: Vitaly Mayatskikh To: Andrew Morton Cc: Oleg Nesterov , Ingo Molnar , Roland McGrath , linux-kernel@vger.kernel.org Subject: [PATCH 4/5] Use copy_wait_opts_to_user() in wait_task_zombie() Date: Mon, 11 May 2009 15:25:53 +0200 Message-Id: <1242048349-2766-5-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() Signed-off-by: Vitaly Mayatskikh --- kernel/exit.c | 39 +++++++++++---------------------------- 1 files changed, 11 insertions(+), 28 deletions(-) diff --git a/kernel/exit.c b/kernel/exit.c index a742ae9..9806332 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -1165,17 +1165,15 @@ static int wait_noreap_copyout(struct wait_opts *wo, struct task_struct *p, static int wait_task_zombie(struct wait_opts *wo, struct task_struct *p) { unsigned long state; - int retval, status, traced; + int retval, why, status, traced; pid_t pid = task_pid_vnr(p); uid_t uid = __task_cred(p)->uid; - struct siginfo __user *infop; if (!likely(wo->wo_flags & WEXITED)) return 0; if (unlikely(wo->wo_flags & WNOWAIT)) { int exit_code = p->exit_code; - int why, status; get_task_struct(p); read_unlock(&tasklist_lock); @@ -1267,36 +1265,21 @@ static int wait_task_zombie(struct wait_opts *wo, struct task_struct *p) */ read_unlock(&tasklist_lock); - retval = wo->wo_rusage - ? getrusage(p, RUSAGE_BOTH, wo->wo_rusage) : 0; status = (p->signal->flags & SIGNAL_GROUP_EXIT) ? p->signal->group_exit_code : p->exit_code; - if (!retval && wo->wo_stat) + if (wo->wo_stat) retval = put_user(status, 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) { - int why; - - if ((status & 0x7f) == 0) { - why = CLD_EXITED; - status >>= 8; - } else { - why = (status & 0x80) ? CLD_DUMPED : CLD_KILLED; - status &= 0x7f; - } - retval = put_user((short)why, &infop->si_code); - if (!retval) - retval = put_user(status, &infop->si_status); + if ((status & 0x7f) == 0) { + why = CLD_EXITED; + status >>= 8; + } else { + why = (status & 0x80) ? CLD_DUMPED : CLD_KILLED; + status &= 0x7f; } - if (!retval && infop) - retval = put_user(pid, &infop->si_pid); - if (!retval && infop) - retval = put_user(uid, &infop->si_uid); + + retval = copy_wait_opts_to_user(wo, p, pid, uid, why, status, SIGCHLD); + if (!retval) retval = pid; -- 1.6.2.2