From: Oleg Nesterov <oleg@redhat.com>
To: Andrew Morton <akpm@linux-foundation.org>,
Davide Libenzi <davidel@xmailserver.org>,
Eric Dumazet <eric.dumazet@gmail.com>, Greg KH <greg@kroah.com>,
Jason Baron <jbaron@redhat.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
Roland McGrath <roland@hack.frob.com>
Cc: Eugene Teo <eugeneteo@kernel.sg>,
Maxime Bizon <mbizon@freebox.fr>,
Denys Vlasenko <dvlasenk@redhat.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH 3/4] signalfd: signalfd_cleanup() can race with remove_wait_queue()
Date: Wed, 22 Feb 2012 18:34:42 +0100 [thread overview]
Message-ID: <20120222173442.GC7147@redhat.com> (raw)
In-Reply-To: <20120222173326.GA7139@redhat.com>
signalfd_cleanup() checks waitqueue_active() lockless, this can
race with ep_unregister_pollwait(). We can see list_empty() == T
before remove_wait_queue() completes and list_empty_careful()
can't help. Add spin_unlock_wait() to serialize.
Reported-by: Maxime Bizon <mbizon@freebox.fr>
Cc: <stable@kernel.org>
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
---
fs/signalfd.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/fs/signalfd.c b/fs/signalfd.c
index 838ba21..6e51887 100644
--- a/fs/signalfd.c
+++ b/fs/signalfd.c
@@ -34,6 +34,10 @@ void signalfd_cleanup(struct sighand_struct *sighand)
{
wait_queue_head_t *wqh = &sighand->signalfd_wqh;
+ /* make sure we can't race with remove_wait_queue() in progress */
+ spin_unlock_wait(&wqh->lock);
+ smp_rmb();
+
if (likely(!waitqueue_active(wqh)))
return;
--
1.5.5.1
next prev parent reply other threads:[~2012-02-22 17:41 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20120222173326.GA7139@redhat.com>
2012-02-22 17:33 ` [PATCH 1/4] signalfd: introduce signalfd_cleanup() Oleg Nesterov
2012-02-22 17:34 ` [PATCH 2/4] epoll: introduce POLLFREE for ep_poll_callback() Oleg Nesterov
2012-02-22 17:34 ` Oleg Nesterov [this message]
2012-02-22 17:35 ` [PATCH 4/4] epoll: ep_unregister_pollwait() can use the freed pwq->whead Oleg Nesterov
2012-02-23 15:44 ` Oleg Nesterov
2012-02-23 22:17 ` Linus Torvalds
2012-02-24 19:06 ` [PATCH v2 0/2] signalfd/epoll fixes Oleg Nesterov
2012-02-24 19:07 ` [PATCH v2 1/2] epoll: introduce POLLFREE to flush ->signalfd_wqh before kfree() Oleg Nesterov
2012-02-29 19:57 ` Andy Lutomirski
2012-02-29 20:06 ` Oleg Nesterov
2012-02-29 20:16 ` Andrew Lutomirski
2012-03-01 19:26 ` Oleg Nesterov
2012-02-24 19:07 ` [PATCH v2 2/2] epoll: ep_unregister_pollwait() can use the freed pwq->whead Oleg Nesterov
2012-02-24 20:23 ` [PATCH v2 0/2] signalfd/epoll fixes Linus Torvalds
2012-02-24 23:14 ` Linus Torvalds
2012-02-25 16:08 ` Oleg Nesterov
2012-02-25 19:00 ` Linus Torvalds
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=20120222173442.GC7147@redhat.com \
--to=oleg@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=davidel@xmailserver.org \
--cc=dvlasenk@redhat.com \
--cc=eric.dumazet@gmail.com \
--cc=eugeneteo@kernel.sg \
--cc=greg@kroah.com \
--cc=jbaron@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mbizon@freebox.fr \
--cc=roland@hack.frob.com \
--cc=torvalds@linux-foundation.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;
as well as URLs for NNTP newsgroup(s).