Skip to content

Commit cc19862

Browse files
lxindavem330
authored andcommitted
tipc: fix an use-after-free issue in tipc_recvmsg
syzbot reported an use-after-free crash: BUG: KASAN: use-after-free in tipc_recvmsg+0xf77/0xf90 net/tipc/socket.c:1979 Call Trace: tipc_recvmsg+0xf77/0xf90 net/tipc/socket.c:1979 sock_recvmsg_nosec net/socket.c:943 [inline] sock_recvmsg net/socket.c:961 [inline] sock_recvmsg+0xca/0x110 net/socket.c:957 tipc_conn_rcv_from_sock+0x162/0x2f0 net/tipc/topsrv.c:398 tipc_conn_recv_work+0xeb/0x190 net/tipc/topsrv.c:421 process_one_work+0x98d/0x1630 kernel/workqueue.c:2276 worker_thread+0x658/0x11f0 kernel/workqueue.c:2422 As Hoang pointed out, it was caused by skb_cb->bytes_read still accessed after calling tsk_advance_rx_queue() to free the skb in tipc_recvmsg(). This patch is to fix it by accessing skb_cb->bytes_read earlier than calling tsk_advance_rx_queue(). Fixes: f4919ff ("tipc: keep the skb in rcv queue until the whole data is read") Reported-by: syzbot+e6741b97d5552f97c24d@syzkaller.appspotmail.com Signed-off-by: Xin Long <lucien.xin@gmail.com> Acked-by: Jon Maloy <jmaloy@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 0e80432 commit cc19862

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

net/tipc/socket.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1973,10 +1973,12 @@ static int tipc_recvmsg(struct socket *sock, struct msghdr *m,
19731973
tipc_node_distr_xmit(sock_net(sk), &xmitq);
19741974
}
19751975

1976-
if (!skb_cb->bytes_read)
1977-
tsk_advance_rx_queue(sk);
1976+
if (skb_cb->bytes_read)
1977+
goto exit;
1978+
1979+
tsk_advance_rx_queue(sk);
19781980

1979-
if (likely(!connected) || skb_cb->bytes_read)
1981+
if (likely(!connected))
19801982
goto exit;
19811983

19821984
/* Send connection flow control advertisement when applicable */

0 commit comments

Comments
 (0)