avoid spurious POLLIN returns in signalfd

[sfrench/cifs-2.6.git] / fs / signalfd.c

diff --git a/fs/signalfd.c b/fs/signalfd.c
index f1da89203a9aeea3108fe9270169c501df821129..3b07f26d984d6bc6ee35eb7bce1e834d1e594da1 100644 (file)
--- a/fs/signalfd.c
+++ b/fs/signalfd.c
@@ -133,7 +133,8 @@ static unsigned int signalfd_poll(struct file *file, poll_table *wait)
         * the peer disconnects.
         */
        if (signalfd_lock(ctx, &lk)) {
-               if (next_signal(&lk.tsk->pending, &ctx->sigmask) > 0 ||
+               if ((lk.tsk == current &&
+                    next_signal(&lk.tsk->pending, &ctx->sigmask) > 0) ||
                    next_signal(&lk.tsk->signal->shared_pending,
                                &ctx->sigmask) > 0)
                        events |= POLLIN;