Skip to content

Commit 6bf4570

Browse files
Allison HendersonPaolo Abeni
authored andcommitted
net/rds: Fix NULL pointer dereference in rds_tcp_accept_one
Save a local pointer to new_sock->sk and hold a reference before installing callbacks in rds_tcp_accept_one. After rds_tcp_set_callbacks() or rds_tcp_reset_callbacks(), tc->t_sock is set to new_sock which may race with the shutdown path. A concurrent rds_tcp_conn_path_shutdown() may call sock_release(), which sets new_sock->sk = NULL and may eventually free sk when the refcount reaches zero. Subsequent accesses to new_sock->sk->sk_state would dereference NULL, causing the crash. The fix saves a local sk pointer before callbacks are installed so that sk_state can be accessed safely even after new_sock->sk is nulled, and uses sock_hold()/sock_put() to ensure sk itself remains valid for the duration. Fixes: 826c100 ("net/rds: rds_tcp_conn_path_shutdown must not discard messages") Reported-by: syzbot+96046021045ffe6d7709@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=96046021045ffe6d7709 Signed-off-by: Allison Henderson <achender@kernel.org> Link: https://patch.msgid.link/20260216222643.2391390-1-achender@kernel.org Signed-off-by: Paolo Abeni <pabeni@redhat.com>
1 parent 45be47b commit 6bf4570

1 file changed

Lines changed: 17 additions & 3 deletions

File tree

net/rds/tcp_listen.c

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ int rds_tcp_accept_one(struct rds_tcp_net *rtn)
177177
struct rds_tcp_connection *rs_tcp = NULL;
178178
int conn_state;
179179
struct rds_conn_path *cp;
180+
struct sock *sk;
180181
struct in6_addr *my_addr, *peer_addr;
181182
#if !IS_ENABLED(CONFIG_IPV6)
182183
struct in6_addr saddr, daddr;
@@ -298,6 +299,17 @@ int rds_tcp_accept_one(struct rds_tcp_net *rtn)
298299
rds_conn_path_drop(cp, 0);
299300
goto rst_nsk;
300301
}
302+
/* Save a local pointer to sk and hold a reference before setting
303+
* callbacks. Once callbacks are set, a concurrent
304+
* rds_tcp_conn_path_shutdown() may call sock_release(), which
305+
* sets new_sock->sk to NULL and drops a reference on sk.
306+
* The local pointer lets us safely access sk_state below even
307+
* if new_sock->sk has been nulled, and sock_hold() keeps sk
308+
* itself valid until we are done.
309+
*/
310+
sk = new_sock->sk;
311+
sock_hold(sk);
312+
301313
if (rs_tcp->t_sock) {
302314
/* Duelling SYN has been handled in rds_tcp_accept_one() */
303315
rds_tcp_reset_callbacks(new_sock, cp);
@@ -316,13 +328,15 @@ int rds_tcp_accept_one(struct rds_tcp_net *rtn)
316328
* knowing that "rds_tcp_conn_path_shutdown" will
317329
* dequeue pending messages.
318330
*/
319-
if (new_sock->sk->sk_state == TCP_CLOSE_WAIT ||
320-
new_sock->sk->sk_state == TCP_LAST_ACK ||
321-
new_sock->sk->sk_state == TCP_CLOSE)
331+
if (READ_ONCE(sk->sk_state) == TCP_CLOSE_WAIT ||
332+
READ_ONCE(sk->sk_state) == TCP_LAST_ACK ||
333+
READ_ONCE(sk->sk_state) == TCP_CLOSE)
322334
rds_conn_path_drop(cp, 0);
323335
else
324336
queue_delayed_work(cp->cp_wq, &cp->cp_recv_w, 0);
325337

338+
sock_put(sk);
339+
326340
new_sock = NULL;
327341
ret = 0;
328342
if (conn->c_npaths == 0)

0 commit comments

Comments
 (0)