Skip to content

Commit 3864c6b

Browse files
swananankuba-moo
authored andcommitted
tcp: call sk_data_ready() after listener migration
When inet_csk_listen_stop() migrates an established child socket from a closing listener to another socket in the same SO_REUSEPORT group, the target listener gets a new accept-queue entry via inet_csk_reqsk_queue_add(), but that path never notifies the target listener's waiters. A nonblocking accept() still works because it checks the queue directly, but poll()/epoll_wait() waiters and blocking accept() callers can also remain asleep indefinitely. Call READ_ONCE(nsk->sk_data_ready)(nsk) after a successful migration in inet_csk_listen_stop(). However, after inet_csk_reqsk_queue_add() succeeds, the ref acquired in reuseport_migrate_sock() is effectively transferred to nreq->rsk_listener. Another CPU can then dequeue nreq via accept() or listener shutdown, hit reqsk_put(), and drop that listener ref. Since listeners are SOCK_RCU_FREE, wrap the post-queue_add() dereferences of nsk in rcu_read_lock()/rcu_read_unlock(), which also covers the existing sock_net(nsk) access in that path. The reqsk_timer_handler() path does not need the same changes for two reasons: half-open requests become readable only after the final ACK, where tcp_child_process() already wakes the listener; and once nreq is visible via inet_ehash_insert(), the success path no longer touches nsk directly. Fixes: 54b92e8 ("tcp: Migrate TCP_ESTABLISHED/TCP_SYN_RECV sockets in accept queues.") Cc: stable@vger.kernel.org Suggested-by: Eric Dumazet <edumazet@google.com> Reviewed-by: Kuniyuki Iwashima <kuniyu@google.com> Signed-off-by: Zhenzhong Wu <jt26wzz@gmail.com> Reviewed-by: Eric Dumazet <edumazet@google.com> Link: https://patch.msgid.link/20260422024554.130346-2-jt26wzz@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent e08a9fa commit 3864c6b

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

net/ipv4/inet_connection_sock.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1479,16 +1479,19 @@ void inet_csk_listen_stop(struct sock *sk)
14791479
if (nreq) {
14801480
refcount_set(&nreq->rsk_refcnt, 1);
14811481

1482+
rcu_read_lock();
14821483
if (inet_csk_reqsk_queue_add(nsk, nreq, child)) {
14831484
__NET_INC_STATS(sock_net(nsk),
14841485
LINUX_MIB_TCPMIGRATEREQSUCCESS);
14851486
reqsk_migrate_reset(req);
1487+
READ_ONCE(nsk->sk_data_ready)(nsk);
14861488
} else {
14871489
__NET_INC_STATS(sock_net(nsk),
14881490
LINUX_MIB_TCPMIGRATEREQFAILURE);
14891491
reqsk_migrate_reset(nreq);
14901492
__reqsk_free(nreq);
14911493
}
1494+
rcu_read_unlock();
14921495

14931496
/* inet_csk_reqsk_queue_add() has already
14941497
* called inet_child_forget() on failure case.

0 commit comments

Comments
 (0)