raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

nfsd: unregister with rpcbind when deleting a transport

Browse Source 
When a listener is added, a part of creation of transport also registers
program/port with rpcbind. However, when the listener is removed,
while transport goes away, rpcbind still has the entry for that
port/type.

When deleting the transport, unregister with rpcbind when appropriate.

---v2 created a new xpt_flag XPT_RPCB_UNREG to mark TCP and UDP
transport and at xprt destroy send rpcbind unregister if flag set.

Suggested-by: Chuck Lever <chuck.lever@oracle.com>
Fixes: d093c90892 ("nfsd: fix management of listener transports")
Cc: stable@vger.kernel.org
Signed-off-by: Olga Kornievskaia <okorniev@redhat.com>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
This commit is contained in:
Olga Kornievskaia
2025-08-19 14:04:02 -04:00
committed by Chuck Lever
parent f64397e04b
commit 898374fdd7
3 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/linux/sunrpc/svc_xprt.h
View File

@@ -104,6 +104,9 @@ enum {
* it has access to. It is NOT counted * it has access to. It is NOT counted
* in ->sv_tmpcnt. * in ->sv_tmpcnt.
*/ */
XPT_RPCB_UNREG, /* transport that needs unregistering
* with rpcbind (TCP, UDP) on destroy
*/
}; };
/* /*

13
net/sunrpc/svc_xprt.c
View File

@@ -1014,6 +1014,19 @@ static void svc_delete_xprt(struct svc_xprt *xprt)
struct svc_serv *serv = xprt->xpt_server; struct svc_serv *serv = xprt->xpt_server;
struct svc_deferred_req *dr; struct svc_deferred_req *dr;
/* unregister with rpcbind for when transport type is TCP or UDP.
*/
if (test_bit(XPT_RPCB_UNREG, &xprt->xpt_flags)) {
struct svc_sock *svsk = container_of(xprt, struct svc_sock,
sk_xprt);
struct socket *sock = svsk->sk_sock;
if (svc_register(serv, xprt->xpt_net, sock->sk->sk_family,
sock->sk->sk_protocol, 0) < 0)
pr_warn("failed to unregister %s with rpcbind\n",
xprt->xpt_class->xcl_name);
}
if (test_and_set_bit(XPT_DEAD, &xprt->xpt_flags)) if (test_and_set_bit(XPT_DEAD, &xprt->xpt_flags))
return; return;

2
net/sunrpc/svcsock.c
View File

@@ -836,6 +836,7 @@ static void svc_udp_init(struct svc_sock *svsk, struct svc_serv *serv)
/* data might have come in before data_ready set up */ /* data might have come in before data_ready set up */
set_bit(XPT_DATA, &svsk->sk_xprt.xpt_flags); set_bit(XPT_DATA, &svsk->sk_xprt.xpt_flags);
set_bit(XPT_CHNGBUF, &svsk->sk_xprt.xpt_flags); set_bit(XPT_CHNGBUF, &svsk->sk_xprt.xpt_flags);
set_bit(XPT_RPCB_UNREG, &svsk->sk_xprt.xpt_flags);
/* make sure we get destination address info */ /* make sure we get destination address info */
switch (svsk->sk_sk->sk_family) { switch (svsk->sk_sk->sk_family) {
@@ -1350,6 +1351,7 @@ static void svc_tcp_init(struct svc_sock *svsk, struct svc_serv *serv)
if (sk->sk_state == TCP_LISTEN) { if (sk->sk_state == TCP_LISTEN) {
strcpy(svsk->sk_xprt.xpt_remotebuf, "listener"); strcpy(svsk->sk_xprt.xpt_remotebuf, "listener");
set_bit(XPT_LISTENER, &svsk->sk_xprt.xpt_flags); set_bit(XPT_LISTENER, &svsk->sk_xprt.xpt_flags);
set_bit(XPT_RPCB_UNREG, &svsk->sk_xprt.xpt_flags);
sk->sk_data_ready = svc_tcp_listen_data_ready; sk->sk_data_ready = svc_tcp_listen_data_ready;
set_bit(XPT_CONN, &svsk->sk_xprt.xpt_flags); set_bit(XPT_CONN, &svsk->sk_xprt.xpt_flags);
} else { } else {