eventfd: guard wake_up in eventfd fs calls as well

[thirdparty/linux.git] / fs / eventfd.c

diff --git a/fs/eventfd.c b/fs/eventfd.c
index 3627dd7d25db80c3f7e65afb8a5cda2e977f5e84..c0ffee99ad238aea86eb9da4bb4bb504274da9d1 100644 (file)
--- a/fs/eventfd.c
+++ b/fs/eventfd.c
@@ -69,17 +69,17 @@ __u64 eventfd_signal(struct eventfd_ctx *ctx, __u64 n)
         * it returns false, the eventfd_signal() call should be deferred to a
         * safe context.
         */
-       if (WARN_ON_ONCE(current->in_eventfd_signal))
+       if (WARN_ON_ONCE(current->in_eventfd))
                return 0;
 
        spin_lock_irqsave(&ctx->wqh.lock, flags);
-       current->in_eventfd_signal = 1;
+       current->in_eventfd = 1;
        if (ULLONG_MAX - ctx->count < n)
                n = ULLONG_MAX - ctx->count;
        ctx->count += n;
        if (waitqueue_active(&ctx->wqh))
                wake_up_locked_poll(&ctx->wqh, EPOLLIN);
-       current->in_eventfd_signal = 0;
+       current->in_eventfd = 0;
        spin_unlock_irqrestore(&ctx->wqh.lock, flags);
 
        return n;
@@ -253,8 +253,10 @@ static ssize_t eventfd_read(struct kiocb *iocb, struct iov_iter *to)
                __set_current_state(TASK_RUNNING);
        }
        eventfd_ctx_do_read(ctx, &ucnt);
+       current->in_eventfd = 1;
        if (waitqueue_active(&ctx->wqh))
                wake_up_locked_poll(&ctx->wqh, EPOLLOUT);
+       current->in_eventfd = 0;
        spin_unlock_irq(&ctx->wqh.lock);
        if (unlikely(copy_to_iter(&ucnt, sizeof(ucnt), to) != sizeof(ucnt)))
                return -EFAULT;
@@ -301,8 +303,10 @@ static ssize_t eventfd_write(struct file *file, const char __user *buf, size_t c
        }
        if (likely(res > 0)) {
                ctx->count += ucnt;
+               current->in_eventfd = 1;
                if (waitqueue_active(&ctx->wqh))
                        wake_up_locked_poll(&ctx->wqh, EPOLLIN);
+               current->in_eventfd = 0;
        }
        spin_unlock_irq(&ctx->wqh.lock);