Skip to content

Commit 80fd53f

Browse files
cdkeysmb49
authored andcommitted
SUNRPC: Fix UAF in svc_tcp_listen_data_ready()
BugLink: https://bugs.launchpad.net/bugs/2032689 commit fc80fc2 upstream. After the listener svc_sock is freed, and before invoking svc_tcp_accept() for the established child sock, there is a window that the newsock retaining a freed listener svc_sock in sk_user_data which cloning from parent. In the race window, if data is received on the newsock, we will observe use-after-free report in svc_tcp_listen_data_ready(). Reproduce by two tasks: 1. while :; do rpc.nfsd 0 ; rpc.nfsd; done 2. while :; do echo "" | ncat -4 127.0.0.1 2049 ; done KASAN report: ================================================================== BUG: KASAN: slab-use-after-free in svc_tcp_listen_data_ready+0x1cf/0x1f0 [sunrpc] Read of size 8 at addr ffff888139d96228 by task nc/102553 CPU: 7 PID: 102553 Comm: nc Not tainted 6.3.0+ #18 Hardware name: VMware, Inc. VMware Virtual Platform/440BX Desktop Reference Platform, BIOS 6.00 11/12/2020 Call Trace: <IRQ> dump_stack_lvl+0x33/0x50 print_address_description.constprop.0+0x27/0x310 print_report+0x3e/0x70 kasan_report+0xae/0xe0 svc_tcp_listen_data_ready+0x1cf/0x1f0 [sunrpc] tcp_data_queue+0x9f4/0x20e0 tcp_rcv_established+0x666/0x1f60 tcp_v4_do_rcv+0x51c/0x850 tcp_v4_rcv+0x23fc/0x2e80 ip_protocol_deliver_rcu+0x62/0x300 ip_local_deliver_finish+0x267/0x350 ip_local_deliver+0x18b/0x2d0 ip_rcv+0x2fb/0x370 __netif_receive_skb_one_core+0x166/0x1b0 process_backlog+0x24c/0x5e0 __napi_poll+0xa2/0x500 net_rx_action+0x854/0xc90 __do_softirq+0x1bb/0x5de do_softirq+0xcb/0x100 </IRQ> <TASK> ... </TASK> Allocated by task 102371: kasan_save_stack+0x1e/0x40 kasan_set_track+0x21/0x30 __kasan_kmalloc+0x7b/0x90 svc_setup_socket+0x52/0x4f0 [sunrpc] svc_addsock+0x20d/0x400 [sunrpc] __write_ports_addfd+0x209/0x390 [nfsd] write_ports+0x239/0x2c0 [nfsd] nfsctl_transaction_write+0xac/0x110 [nfsd] vfs_write+0x1c3/0xae0 ksys_write+0xed/0x1c0 do_syscall_64+0x38/0x90 entry_SYSCALL_64_after_hwframe+0x72/0xdc Freed by task 102551: kasan_save_stack+0x1e/0x40 kasan_set_track+0x21/0x30 kasan_save_free_info+0x2a/0x50 __kasan_slab_free+0x106/0x190 __kmem_cache_free+0x133/0x270 svc_xprt_free+0x1e2/0x350 [sunrpc] svc_xprt_destroy_all+0x25a/0x440 [sunrpc] nfsd_put+0x125/0x240 [nfsd] nfsd_svc+0x2cb/0x3c0 [nfsd] write_threads+0x1ac/0x2a0 [nfsd] nfsctl_transaction_write+0xac/0x110 [nfsd] vfs_write+0x1c3/0xae0 ksys_write+0xed/0x1c0 do_syscall_64+0x38/0x90 entry_SYSCALL_64_after_hwframe+0x72/0xdc Fix the UAF by simply doing nothing in svc_tcp_listen_data_ready() if state != TCP_LISTEN, that will avoid dereferencing svsk for all child socket. Link: https://lore.kernel.org/lkml/[email protected]/ Fixes: fa9251a ("SUNRPC: Call the default socket callbacks instead of open coding") Signed-off-by: Ding Hui <[email protected]> Cc: <[email protected]> Signed-off-by: Chuck Lever <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Kamal Mostafa <[email protected]> Signed-off-by: Stefan Bader <[email protected]>
1 parent cf6fa21 commit 80fd53f

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

net/sunrpc/svcsock.c

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -685,12 +685,6 @@ static void svc_tcp_listen_data_ready(struct sock *sk)
685685
{
686686
struct svc_sock *svsk = (struct svc_sock *)sk->sk_user_data;
687687

688-
if (svsk) {
689-
/* Refer to svc_setup_socket() for details. */
690-
rmb();
691-
svsk->sk_odata(sk);
692-
}
693-
694688
/*
695689
* This callback may called twice when a new connection
696690
* is established as a child socket inherits everything
@@ -699,13 +693,18 @@ static void svc_tcp_listen_data_ready(struct sock *sk)
699693
* when one of child sockets become ESTABLISHED.
700694
* 2) data_ready method of the child socket may be called
701695
* when it receives data before the socket is accepted.
702-
* In case of 2, we should ignore it silently.
696+
* In case of 2, we should ignore it silently and DO NOT
697+
* dereference svsk.
703698
*/
704-
if (sk->sk_state == TCP_LISTEN) {
705-
if (svsk) {
706-
set_bit(XPT_CONN, &svsk->sk_xprt.xpt_flags);
707-
svc_xprt_enqueue(&svsk->sk_xprt);
708-
}
699+
if (sk->sk_state != TCP_LISTEN)
700+
return;
701+
702+
if (svsk) {
703+
/* Refer to svc_setup_socket() for details. */
704+
rmb();
705+
svsk->sk_odata(sk);
706+
set_bit(XPT_CONN, &svsk->sk_xprt.xpt_flags);
707+
svc_xprt_enqueue(&svsk->sk_xprt);
709708
}
710709
}
711710

0 commit comments

Comments
 (0)