From: Vitaly Mayatskikh <v.mayatskih@gmail.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Oleg Nesterov <oleg@redhat.com>, Ingo Molnar <mingo@elte.hu>,
Roland McGrath <roland@redhat.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH 3/5] Use copy_wait_opts_to_user() in do_wait()
Date: Mon, 11 May 2009 15:25:52 +0200 [thread overview]
Message-ID: <1242048349-2766-4-git-send-email-v.mayatskih@gmail.com> (raw)
In-Reply-To: <1242048349-2766-1-git-send-email-v.mayatskih@gmail.com>
All copy-paste getrusage() and put_user() code in wait_task_* functions
is replaced by call to copy_wait_opts_to_user()
Use copy_wait_opts_to_user() in do_wait() to clean up user's siginfo structure.
Signed-off-by: Vitaly Mayatskikh <v.mayatskih@gmail.com>
---
kernel/exit.c | 15 +--------------
1 files changed, 1 insertions(+), 14 deletions(-)
diff --git a/kernel/exit.c b/kernel/exit.c
index 0bf2d3c..a742ae9 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -1600,8 +1600,6 @@ end:
__set_current_state(TASK_RUNNING);
remove_wait_queue(¤t->signal->wait_chldexit,&wait);
if (wo->wo_info) {
- struct siginfo __user *infop = wo->wo_info;
-
if (retval > 0)
retval = 0;
else {
@@ -1610,18 +1608,7 @@ end:
* we would set so the user can easily tell the
* difference.
*/
- if (!retval)
- retval = put_user(0, &infop->si_signo);
- if (!retval)
- retval = put_user(0, &infop->si_errno);
- if (!retval)
- retval = put_user(0, &infop->si_code);
- if (!retval)
- retval = put_user(0, &infop->si_pid);
- if (!retval)
- retval = put_user(0, &infop->si_uid);
- if (!retval)
- retval = put_user(0, &infop->si_status);
+ retval = copy_wait_opts_to_user(wo, 0, 0, 0, 0, 0, 0);
}
}
return retval;
--
1.6.2.2
next prev parent reply other threads:[~2009-05-11 13:28 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-11 13:25 [PATCH 0/5] wait_task_* cleanups V2 Vitaly Mayatskikh
2009-05-11 13:25 ` [PATCH 1/5] Split wait_noreap_copyout() Vitaly Mayatskikh
2009-05-11 23:45 ` Andrew Morton
2009-05-20 15:21 ` Vitaly Mayatskikh
2009-05-20 15:57 ` Oleg Nesterov
2009-05-20 20:29 ` Roland McGrath
2009-05-20 18:21 ` Ingo Molnar
2009-05-21 14:12 ` Oleg Nesterov
2009-05-21 14:35 ` Vitaly Mayatskikh
2009-06-09 15:14 ` Vitaly Mayatskikh
2009-05-11 13:25 ` [PATCH 2/5] Use copy_wait_opts_to_user() in wait_task_stopped() Vitaly Mayatskikh
2009-05-11 13:25 ` Vitaly Mayatskikh [this message]
2009-06-15 16:39 ` [PATCH 3/5] Use copy_wait_opts_to_user() in do_wait() Oleg Nesterov
2009-05-11 13:25 ` [PATCH 4/5] Use copy_wait_opts_to_user() in wait_task_zombie() Vitaly Mayatskikh
2009-06-15 16:43 ` Oleg Nesterov
2009-05-11 13:25 ` [PATCH 5/5] Use copy_wait_opts_to_user() in wait_task_continued() Vitaly Mayatskikh
2009-06-15 16:55 ` Oleg Nesterov
2009-06-15 17:13 ` Oleg Nesterov
2009-06-15 17:16 ` Andrew Morton
2009-05-12 3:19 ` [PATCH 0/5] wait_task_* cleanups V2 Roland McGrath
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=1242048349-2766-4-git-send-email-v.mayatskih@gmail.com \
--to=v.mayatskih@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--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
all inboxes | Powered by JetHome®