SUNRPC: Don't call connect() more than once on a TCP socket
authorMeena Shanmugam <meenashanmugam@google.com>
Wed, 18 May 2022 18:40:10 +0000 (18:40 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 25 May 2022 07:14:34 +0000 (09:14 +0200)
commit975a0f14d5cd29fe4b33190b5afcfa9f244b769d
treebe03a6d6c3768766a882e2c67f69e7a4e84831a2
parentaa4d71edd60941bc05d2a0efe1e98a67c5dd59b7
SUNRPC: Don't call connect() more than once on a TCP socket

From: Trond Myklebust <trond.myklebust@hammerspace.com>

commit 89f42494f92f448747bd8a7ab1ae8b5d5520577d upstream.

Avoid socket state races due to repeated calls to ->connect() using the
same socket. If connect() returns 0 due to the connection having
completed, but we are in fact in a closing state, then we may leave the
XPRT_CONNECTING flag set on the transport.

Reported-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
Fixes: 3be232f11a3c ("SUNRPC: Prevent immediate close+reconnect")
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
[meenashanmugam: Fix merge conflict in xs_tcp_setup_socket]
Signed-off-by: Meena Shanmugam <meenashanmugam@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
include/linux/sunrpc/xprtsock.h
net/sunrpc/xprtsock.c