sunrpc: clear XPRT_SOCK_UPD_TIMEOUT when reset transport

liujian56 · Trond Myklebust · commit 4db9ad82a6c8 · 2024-11-28T12:55:32.000-05:00
Since transport->sock has been set to NULL during reset transport, XPRT_SOCK_UPD_TIMEOUT also needs to be cleared. Otherwise, the xs_tcp_set_socket_timeouts() may be triggered in xs_tcp_send_request() to dereference the transport->sock that has been set to NULL. Fixes: 7196dbb ("SUNRPC: Allow changing of the TCP timeout parameters on the fly") Signed-off-by: Li Lingfeng <lilingfeng3@huawei.com> Signed-off-by: Liu Jian <liujian56@huawei.com> Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
@@ -1198,6 +1198,7 @@ static void xs_sock_reset_state_flags(struct rpc_xprt *xprt)
 	clear_bit(XPRT_SOCK_WAKE_WRITE, &transport->sock_state);
 	clear_bit(XPRT_SOCK_WAKE_DISCONNECT, &transport->sock_state);
 	clear_bit(XPRT_SOCK_NOSPACE, &transport->sock_state);
+	clear_bit(XPRT_SOCK_UPD_TIMEOUT, &transport->sock_state);
 }
 
 static void xs_run_error_worker(struct sock_xprt *transport, unsigned int nr)

Original file line number	Diff line number	Diff line change
`@@ -1198,6 +1198,7 @@ static void xs_sock_reset_state_flags(struct rpc_xprt *xprt)`
`1198`	`1198`	`clear_bit(XPRT_SOCK_WAKE_WRITE, &transport->sock_state);`
`1199`	`1199`	`clear_bit(XPRT_SOCK_WAKE_DISCONNECT, &transport->sock_state);`
`1200`	`1200`	`clear_bit(XPRT_SOCK_NOSPACE, &transport->sock_state);`
	`1201`	`+ clear_bit(XPRT_SOCK_UPD_TIMEOUT, &transport->sock_state);`
`1201`	`1202`	`}`
`1202`	`1203`
`1203`	`1204`	`static void xs_run_error_worker(struct sock_xprt *transport, unsigned int nr)`