Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

poll_wait: add mb() to fix theoretical race between waitqueue_active() and .poll()

As the comment above waitqueue_active() explains, it can only be used
if both waker and waiter have mb()'s that pair with each other. However
__pollwait() is broken in this respect.

This is not pipe-specific, but let's look at pipe_poll() for example:

poll_wait(...); // -> __pollwait() -> add_wait_queue()

LOAD(pipe->head);
LOAD(pipe->head);

In theory these LOAD()'s can leak into the critical section inside
add_wait_queue() and can happen before list_add(entry, wq_head), in this
case pipe_poll() can race with wakeup_pipe_readers/writers which do

smp_mb();
if (waitqueue_active(wq_head))
wake_up_interruptible(wq_head);

There are more __pollwait()-like functions (grep init_poll_funcptr), and
it seems that at least ep_ptable_queue_proc() has the same problem, so the
patch adds smp_mb() into poll_wait().

Link: https://lore.kernel.org/all/20250102163320.GA17691@redhat.com/
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Link: https://lore.kernel.org/r/20250107162717.GA18922@redhat.com
Signed-off-by: Christian Brauner <brauner@kernel.org>

authored by

Oleg Nesterov and committed by
Christian Brauner
cacd9ae4 40384c84

+9 -1
+9 -1
include/linux/poll.h
··· 41 41 42 42 static inline void poll_wait(struct file * filp, wait_queue_head_t * wait_address, poll_table *p) 43 43 { 44 - if (p && p->_qproc && wait_address) 44 + if (p && p->_qproc && wait_address) { 45 45 p->_qproc(filp, wait_address, p); 46 + /* 47 + * This memory barrier is paired in the wq_has_sleeper(). 48 + * See the comment above prepare_to_wait(), we need to 49 + * ensure that subsequent tests in this thread can't be 50 + * reordered with __add_wait_queue() in _qproc() paths. 51 + */ 52 + smp_mb(); 53 + } 46 54 } 47 55 48 56 /*