SUNRPC: Don't leak sockets in xs_local_connect()
Subsystems (3)
[email protected]
maintainerPATCH 1/2 SUNRPC: Don't leak sockets in xs_local_connect()
From: Trond Myklebust <[email protected]>
If there is still a closed socket associated with the transport, then we need to trigger an autoclose before we can set up a new connection.
--- net/sunrpc/xprtsock.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
net/sunrpc/xprtsock.c +10 -1
@@ -1950,6 +1950,9 @@ static void xs_local_connect(struct rpc_xprt *xprt, struct rpc_task *task) struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt);int ret; +if (transport->file) + goto force_disconnect; +if (RPC_IS_ASYNC (task)) {/* * We want the AF_LOCAL connect to be resolved in the
@@ -1962,11 +1965,17 @@ static void xs_local_connect(struct rpc_xprt *xprt, struct rpc_task *task)*/ task->tk_rpc_status = -ENOTCONN ;rpc_exit (task, -ENOTCONN ); -return ; + goto out_wake; } ret =xs_local_setup_socket (transport);if (ret && !RPC_IS_SOFTCONN (task))msleep_interruptible (15000 ); +return ; +force_disconnect: +xprt_force_disconnect (xprt); +out_wake: +xprt_clear_connecting (xprt); +xprt_wake_pending_tasks (xprt, -ENOTCONN ); }#if IS_ENABLED (CONFIG_SUNRPC_SWAP )
Signature · 1 line
2.35.1
[email protected]
maintainerPATCH 2/2 SUNRPC: Ensure timely close of disconnected AF_LOCAL sockets
From: Trond Myklebust <[email protected]>
When the rpcbind server closes the socket, we need to ensure that the socket is closed by the kernel as soon as feasible, so add a sk_state_change callback to trigger this close.
--- net/sunrpc/xprtsock.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
net/sunrpc/xprtsock.c +20 -0
@@ -1418,6 +1418,25 @@ static size_t xs_tcp_bc_maxpayload(struct rpc_xprt *xprt) }#endif /* CONFIG_SUNRPC_BACKCHANNEL */ +/** +* xs_local_state_change - callback to handle AF_LOCAL socket state changes +* @sk: socket whose state has changed +* +*/ +static void xs_local_state_change (struct sock *sk) +{ +struct rpc_xprt *xprt; +struct sock_xprt *transport; + +if (!(xprt =xprt_from_sock (sk))) +return ; +if (sk->sk_shutdown &SHUTDOWN_MASK ) { +clear_bit (XPRT_CONNECTED , &xprt->state); +/* Trigger the socket release */ +xs_run_error_worker (transport,XPRT_SOCK_WAKE_DISCONNECT ); + } +} +/** * xs_tcp_state_change - callback to handle TCP socket state changes * @sk: socket whose state has changed
@@ -1866,6 +1885,7 @@ static int xs_local_finish_connecting(struct rpc_xprt *xprt, sk->sk_user_data = xprt; sk->sk_data_ready = xs_data_ready; sk->sk_write_space = xs_udp_write_space; + sk->sk_state_change = xs_local_state_change; sk->sk_error_report = xs_error_report;xprt_clear_connected (xprt);
Signature · 1 line
2.35.1
Re: [PATCH 2/2] SUNRPC: Ensure timely close of disconnected AF_LOCAL sockets
Quoted 10 lines · 在 2022/4/28 23:30, [email protected] 写道:
From: Trond Myklebust <[email protected]>
When the rpcbind server closes the socket, we need to ensure that the socket is closed by the kernel as soon as feasible, so add a
sk_state_changecallback to trigger this close.Signed-off-by Trond Myklebust <[email protected]>--- net/sunrpc/xprtsock.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
Apply patches 1 and 2 and execute the following script, the null pointer reference problem will occur.
while true
do
systemctl stop rpcbind.service
systemctl stop rpc-statd.service
systemctl stop nfs-server.service
systemctl restart rpcbind.service
systemctl restart rpc-statd.service
systemctl restart nfs-server.service
done
[ 86.376682][ T6613] BUG: kernel NULL pointer dereference, address: 0000000000000990
[ 86.379818][ T6613] #PF: supervisor write access in kernel mode
[ 86.381865][ T6613] #PF: error_code(0x0002) - not-present page
[ 86.383071][ T6613] PGD 0 P4D 0
[ 86.383071][ T6613] Oops: 0002 [#1] PREEMPT SMP
[ 86.383071][ T6613] CPU: 3 PID: 6613 Comm: gssproxy Not tainted 5.18.0-rc4+ #15
[ 86.383071][ T6613] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.10.2-1ubuntu1 04/01/2014
[ 86.383071][ T6613] RIP: 0010:xs_run_error_worker+0x17/0x40
[ 86.383071][ T6613] Code: d4 b6 84 e8 6f 2c 47 00 e8 c6 c9 48 00 66 0f 1f 44 00 00 0f 1f 44 00 00 55 48 89 e5 41 54 41 89 f4 53 48 89 fb e8 59 3e ae fd <f0> 4c 0f ab a3 90 09 00 00 48 8b 35 b1 22 df 01 48 8d 93 40 0a 00 [ 86.383071][ T6613] RSP: 0018:ffffc90003c33cc8 EFLAGS: 00010293
[ 86.383071][ T6613] RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000
[ 86.383071][ T6613] RDX: ffff88824c588040 RSI: ffffffff837cdf27 RDI: 0000000000000000
[ 86.383071][ T6613] RBP: ffffc90003c33cd8 R08: 0000000000000001 R09: 0000000000000000
[ 86.383071][ T6613] R10: 000000000000452c R11: 0000000000000001 R12: 0000000000000007
[ 86.383071][ T6613] R13: ffff8882627781d8 R14: 0000000000000001 R15: 0000000000000000
[ 86.383071][ T6613] FS: 00007f69a87abc40(0000) GS:ffff888437c80000(0000) knlGS:0000000000000000
[ 86.383071][ T6613] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[ 86.383071][ T6613] CR2: 0000000000000990 CR3: 0000000256697000 CR4: 00000000000006e0
[ 86.383071][ T6613] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
[ 86.383071][ T6613] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
[ 86.383071][ T6613] Call Trace:
[ 86.383071][ T6613] <TASK>
[ 86.383071][ T6613] xs_local_state_change+0x53/0x60
[ 86.383071][ T6613] unix_release_sock+0x308/0x540
[ 86.383071][ T6613] ? __sock_release+0x100/0x100
[ 86.383071][ T6613] unix_release+0x38/0x50
[ 86.383071][ T6613] __sock_release+0x50/0x100
[ 86.383071][ T6613] sock_close+0x21/0x30
[ 86.383071][ T6613] __fput+0xe1/0x390
[ 86.383071][ T6613] ? lockdep_hardirqs_on+0x84/0x110
[ 86.383071][ T6613] ____fput+0x1a/0x20
[ 86.383071][ T6613] task_work_run+0x88/0xd0
[ 86.383071][ T6613] do_exit+0x4a1/0x1170
[ 86.383071][ T6613] ? __this_cpu_preempt_check+0x1c/0x20
[ 86.383071][ T6613] do_group_exit+0x4c/0xf0
[ 86.383071][ T6613] __x64_sys_exit_group+0x21/0x30
[ 86.383071][ T6613] do_syscall_64+0x34/0x80
[ 86.383071][ T6613] entry_SYSCALL_64_after_hwframe+0x44/0xae
[ 86.383071][ T6613] RIP: 0033:0x7f69a4cd4ff8
[ 86.383071][ T6613] Code: Unable to access opcode bytes at RIP 0x7f69a4cd4fce.
[ 86.383071][ T6613] RSP: 002b:00007ffc9b51b518 EFLAGS: 00000246 ORIG_RAX: 00000000000000e7
[ 86.383071][ T6613] RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f69a4cd4ff8
[ 86.463441][ T6613] RDX: 0000000000000000 RSI: 000000000000003c RDI: 0000000000000000
[ 86.463441][ T6613] RBP: 00007f69a4fcb8a0 R08: 00000000000000e7 R09: fffffffffffffa68
[ 86.463441][ T6613] R10: 00007f6999215dd8 R11: 0000000000000246 R12: 00007f69a4fcb8a0
[ 86.463441][ T6613] R13: 00007f69a4fd0c00 R14: 0000000000000000 R15: 0000000000000000
[ 86.463441][ T6613] </TASK>
[ 86.463441][ T6613] Modules linked in:
[ 86.473274][ T6613] CR2: 0000000000000990
[ 86.473274][ T6613] ---[ end trace 0000000000000000 ]---
[ 86.473274][ T6613] RIP: 0010:xs_run_error_worker+0x17/0x40
[ 86.473274][ T6613] Code: d4 b6 84 e8 6f 2c 47 00 e8 c6 c9 48 00 66 0f 1f 44 00 00 0f 1f 44 00 00 55 48 89 e5 41 54 41 89 f4 53 48 89 fb e8 59 3e ae fd <f0> 4c 0f ab a3 90 09 00 00 48 8b 35 b1 22 df 01 48 8d 93 40 0a 00 [ 86.473274][ T6613] RSP: 0018:ffffc90003c33cc8 EFLAGS: 00010293
[ 86.473274][ T6613] RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000
[ 86.473274][ T6613] RDX: ffff88824c588040 RSI: ffffffff837cdf27 RDI: 0000000000000000
[ 86.473274][ T6613] RBP: ffffc90003c33cd8 R08: 0000000000000001 R09: 0000000000000000
[ 86.473274][ T6613] R10: 000000000000452c R11: 0000000000000001 R12: 0000000000000007
[ 86.473274][ T6613] R13: ffff8882627781d8 R14: 0000000000000001 R15: 0000000000000000
[ 86.473274][ T6613] FS: 00007f69a87abc40(0000) GS:ffff888437c80000(0000) knlGS:0000000000000000
[ 86.473274][ T6613] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[ 86.473274][ T6613] CR2: 0000000000000990 CR3: 0000000256697000 CR4: 00000000000006e0
[ 86.473274][ T6613] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
[ 86.473274][ T6613] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
[ 86.473274][ T6613] Kernel panic - not syncing: Fatal exception
[ 86.473274][ T6613] Kernel Offset: disabled
[ 86.473274][ T6613] Rebooting in 86400 seconds..
Quoted 38 lines
net/sunrpc/xprtsock.c +20
-0@@ -1418,6 +1418,25 @@ static size_t xs_tcp_bc_maxpayload(struct rpc_xprt *xprt) }#endif /* CONFIG_SUNRPC_BACKCHANNEL */ +/** +* xs_local_state_change - callback to handle AF_LOCAL socket state changes +* @sk: socket whose state has changed +* +*/ +static void xs_local_state_change (struct sock *sk) +{ +struct rpc_xprt *xprt; +struct sock_xprt *transport; + +if (!(xprt =xprt_from_sock (sk))) +return ; +if (sk->sk_shutdown &SHUTDOWN_MASK ) { +clear_bit (XPRT_CONNECTED , &xprt->state); +/* Trigger the socket release */ +xs_run_error_worker (transport,XPRT_SOCK_WAKE_DISCONNECT ); + } +} +/** * xs_tcp_state_change - callback to handle TCP socket state changes * @sk: socket whose state has changed @@ -1866,6 +1885,7 @@ static int xs_local_finish_connecting(struct rpc_xprt *xprt, sk->sk_user_data = xprt; sk->sk_data_ready = xs_data_ready; sk->sk_write_space = xs_udp_write_space; + sk->sk_state_change = xs_local_state_change; sk->sk_error_report = xs_error_report;xprt_clear_connected (xprt);
Signature · 1 line
Wang Hai
Quoted 11 lines · 在 2022/4/28 23:30, [email protected] 写道:
From: Trond Myklebust <[email protected]>
If there is still a closed socket associated with the transport, then we need to trigger an autoclose before we can set up a new connection.
Reported-by wanghai (M) <[email protected]>Fixes f00432063db1 ("SUNRPC: Ensure we flush any closed sockets before xs_xprt_free()")Signed-off-by Trond Myklebust <[email protected]>--- net/sunrpc/xprtsock.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
Hi, Trond.
Thank you for taking the time to help!
I tested it with this patch and found that the problem still exists. The path of the sock leak is as follows and is not in xs_local_connect()
write_ports
nfsd_create_serv
svc_bind
rpcb_create_local
rpcb_create_local_unix
rpc_create
xprt_create_transport
xs_setup_local
xs_local_setup_socket
Quoted 33 lines
net/sunrpc/xprtsock.c +10
-1@@ -1950,6 +1950,9 @@ static void xs_local_connect(struct rpc_xprt *xprt, struct rpc_task *task) struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt);int ret; +if (transport->file) + goto force_disconnect; +if (RPC_IS_ASYNC (task)) {/* * We want the AF_LOCAL connect to be resolved in the @@ -1962,11 +1965,17 @@ static void xs_local_connect(struct rpc_xprt *xprt, struct rpc_task *task)*/ task->tk_rpc_status = -ENOTCONN ;rpc_exit (task, -ENOTCONN ); -return ; + goto out_wake; } ret =xs_local_setup_socket (transport);if (ret && !RPC_IS_SOFTCONN (task))msleep_interruptible (15000 ); +return ; +force_disconnect: +xprt_force_disconnect (xprt); +out_wake: +xprt_clear_connecting (xprt); +xprt_wake_pending_tasks (xprt, -ENOTCONN ); }#if IS_ENABLED (CONFIG_SUNRPC_SWAP )
Signature · 1 line
Wang Hai