Commit bc1c56e9 authored by NeilBrown's avatar NeilBrown Committed by Trond Myklebust
Browse files

SUNRPC: prevent port reuse on transports which don't request it. 



If an RPC client is created without RPC_CLNT_CREATE_REUSEPORT, it should
not reuse the source port when a TCP connection is re-established.
This is currently implemented by preventing the source port being
recorded after a successful connection (the call to xs_set_srcport()).

However the source port is also recorded after a successful bind in xs_bind().
This may not be needed at all and certainly is not wanted when
RPC_CLNT_CREATE_REUSEPORT wasn't requested.

So avoid that assignment when xprt.reuseport is not set.

With this change, NFSv4.1 and later mounts use a different port number on
each connection.  This is helpful with some firewalls which don't cope
well with port reuse.

Signed-off-by: default avatarNeilBrown <neilb@suse.de>
Fixes: e6237b6f ("NFSv4.1: Don't rebind to the same source port when reconnecting to the server")
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent bb24cc0f

net/sunrpc/xprtsock.c

+2 −1
Original line number Diff line number Diff line
@@ -1689,6 +1689,7 @@ static int xs_bind(struct sock_xprt *transport, struct socket *sock) 
		err = kernel_bind(sock, (struct sockaddr *)&myaddr,

				transport->xprt.addrlen);

		if (err == 0) {

			if (transport->xprt.reuseport)

				transport->srcport = port;

			break;

		}