6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yewon Choi woni9911@gmail.com
[ Upstream commit e4d008d49a7135214e0ee70537405b6a069e3a3f ]
In xsk_poll(), checking available events and setting mask bits should be executed only when a socket has been bound. Setting mask bits for unbound socket is meaningless.
Currently, it checks events even when xsk_check_common() failed. To prevent this, we move goto location (skip_tx) after that checking.
Fixes: 1596dae2f17e ("xsk: check IFF_UP earlier in Tx path") Signed-off-by: Yewon Choi woni9911@gmail.com Signed-off-by: Daniel Borkmann daniel@iogearbox.net Acked-by: Magnus Karlsson magnus.karlsson@intel.com Link: https://lore.kernel.org/bpf/20231201061048.GA1510@libra05 Signed-off-by: Sasha Levin sashal@kernel.org --- net/xdp/xsk.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c index 55f8b9b0e06d1..3515e19852d88 100644 --- a/net/xdp/xsk.c +++ b/net/xdp/xsk.c @@ -919,7 +919,7 @@ static __poll_t xsk_poll(struct file *file, struct socket *sock,
rcu_read_lock(); if (xsk_check_common(xs)) - goto skip_tx; + goto out;
pool = xs->pool;
@@ -931,12 +931,11 @@ static __poll_t xsk_poll(struct file *file, struct socket *sock, xsk_generic_xmit(sk); }
-skip_tx: if (xs->rx && !xskq_prod_is_empty(xs->rx)) mask |= EPOLLIN | EPOLLRDNORM; if (xs->tx && xsk_tx_writeable(xs)) mask |= EPOLLOUT | EPOLLWRNORM; - +out: rcu_read_unlock(); return mask; }