From: Oleg Nesterov <oleg@redhat.com>
To: Andrew Morton <akpm@linux-foundation.org>,
"Eric W. Biederman" <ebiederm@xmission.com>
Cc: Michal Hocko <mhocko@suse.cz>, Sameer Nanda <snanda@chromium.org>,
Sergey Dyasly <dserrg@gmail.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH 2/4] proc: change first_tid() to use while_each_thread() rather than next_thread()
Date: Wed, 20 Nov 2013 19:30:24 +0100 [thread overview]
Message-ID: <20131120183024.GA12212@redhat.com> (raw)
In-Reply-To: <20131120183009.GA12193@redhat.com>
Rerwrite the main loop to use while_each_thread() instead of
next_thread(). We are going to fix or replace while_each_thread(),
next_thread() should be avoided whenever possible.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
---
fs/proc/base.c | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/fs/proc/base.c b/fs/proc/base.c
index da12c5c..7ab3785 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -3100,23 +3100,23 @@ static struct task_struct *first_tid(struct task_struct *leader,
}
/* If nr exceeds the number of threads there is nothing todo */
- pos = NULL;
if (nr && nr >= get_nr_threads(leader))
- goto out;
+ goto fail;
/* It could be unhashed before we take rcu lock */
if (!pid_alive(leader))
- goto out;
+ goto fail;
/* If we haven't found our starting place yet start
* with the leader and walk nr threads forward.
*/
- for (pos = leader; nr > 0; --nr) {
- pos = next_thread(pos);
- if (pos == leader) {
- pos = NULL;
- goto out;
- }
- }
+ pos = leader;
+ do {
+ if (nr-- <= 0)
+ goto found;
+ } while_each_thread(leader, pos);
+fail:
+ pos = NULL;
+ goto out;
found:
get_task_struct(pos);
out:
--
1.5.5.1
next prev parent reply other threads:[~2013-11-20 18:29 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-20 18:30 [PATCH 0/4] proc: proc_task_readdir/first_tid fixes/cleanups Oleg Nesterov
2013-11-20 18:30 ` [PATCH 1/4] proc: fix the potential use-after-free in first_tid() Oleg Nesterov
2013-11-20 18:30 ` Oleg Nesterov [this message]
2013-11-20 18:30 ` [PATCH 3/4] proc: don't (ab)use ->group_leader in proc_task_readdir() paths Oleg Nesterov
2013-11-20 18:30 ` [PATCH 4/4] proc: fix ->f_pos overflows in first_tid() Oleg Nesterov
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=20131120183024.GA12212@redhat.com \
--to=oleg@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=dserrg@gmail.com \
--cc=ebiederm@xmission.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mhocko@suse.cz \
--cc=snanda@chromium.org \
/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