net/x25: fix call timeouts in blocking connects
Subsystems (3)
Martin Schiller
maintainerPATCH 1/1 net/x25: fix call timeouts in blocking connects
When a userspace application starts a blocking connect(), a CALL REQUEST is sent, the t21 timer is started and the connect is waiting in x25_wait_for_connection_establishment(). If then for some reason the t21 timer expires before any reaction on the assigned logical channel (e.g. CALL ACCEPT, CLEAR REQUEST), there is sent a CLEAR REQUEST and timer t23 is started waiting for a CLEAR confirmation. If we now receive a CLEAR CONFIRMATION from the peer, x25_disconnect() is called in x25_state2_machine() with reason "0", which means "normal" call clearing. This is ok, but the parameter "reason" is used as sk->sk_err in x25_disconnect() and sock_error(sk) is evaluated in x25_wait_for_connection_establishment() to check if the call is still pending. As "0" is not rated as an error, the connect will stuck here forever.
To fix this situation, also check if the sk->sk_state changed form TCP_SYN_SENT to TCP_CLOSE in the meantime, which is also done by x25_disconnect().
--- net/x25/af_x25.c | 5 +++++ 1 file changed, 5 insertions(+)
net/x25/af_x25.c +5 -0
@@ -719,6 +719,11 @@ static int x25_wait_for_connection_establishment(struct sock *sk) sk->sk_socket->state =SS_UNCONNECTED ;break ; } + rc = -ENOTCONN ; +if (sk->sk_state ==TCP_CLOSE ) { + sk->sk_socket->state =SS_UNCONNECTED ; +break ; + } rc =0 ;if (sk->sk_state !=TCP_ESTABLISHED ) {release_sock (sk);
Signature · 1 line
2.20.1
This patch was applied to netdev/net.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (master)
by Jakub Kicinski <[email protected]>:
Quoted 14 lines · On Fri, 5 Aug 2022 08:18:10 +0200 you wrote:
When a userspace application starts a blocking
connect(), a CALL REQUEST is sent, the t21 timer is started and the connect is waiting inx25_wait_for_connection_establishment(). If then for some reason the t21 timer expires before any reaction on the assigned logical channel (e.g. CALL ACCEPT, CLEAR REQUEST), there is sent a CLEAR REQUEST and timer t23 is started waiting for a CLEAR confirmation. If we now receive a CLEAR CONFIRMATION from the peer,x25_disconnect()is called inx25_state2_machine()with reason "0", which means "normal" call clearing. This is ok, but the parameter "reason" is used assk->sk_errinx25_disconnect()andsock_error(sk)is evaluated inx25_wait_for_connection_establishment()to check if the call is still pending. As "0" is not rated as an error, the connect will stuck here forever.
Quoted 1 line
[...]
Here is the summary with links:
- [net] net/x25: fix call timeouts in blocking connects
https://git.kernel.org/netdev/net/c/944e594cfa84
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html