nfsd: unregister with rpcbind when deleting a transport

[ Upstream commit 898374fdd7f06fa4c4a66e8be3135efeae6128d5 ]

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: d093c9089260 ("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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/include/linux/sunrpc/svc_xprt.h b/include/linux/sunrpc/svc_xprt.h
index 7064ebbd550b566a64078e573f6ae9cc2f6253c5..72d1a08f482821c53896e152b6e7ef31aeef0a62 100644 (file)
--- a/include/linux/sunrpc/svc_xprt.h
+++ b/include/linux/sunrpc/svc_xprt.h
@@ -103,6 +103,9 @@ enum {
                                 * it has access to.  It is NOT counted
                                 * in ->sv_tmpcnt.
                                 */
+       XPT_RPCB_UNREG,         /* transport that needs unregistering
+                                * with rpcbind (TCP, UDP) on destroy
+                                */
 };
 
 static inline void svc_xprt_set_valid(struct svc_xprt *xpt)

diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c
index dbd96b295dfa077d0c0030f3c9ce44929436344e..67474470320cba5866f947e027d201ab4272e35d 100644 (file)
--- a/net/sunrpc/svc_xprt.c
+++ b/net/sunrpc/svc_xprt.c
@@ -1028,6 +1028,19 @@ static void svc_delete_xprt(struct svc_xprt *xprt)
        struct svc_serv *serv = xprt->xpt_server;
        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))
                return;
 

diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index e61e945760582af0bdf06d3417e5db1a474edf44..443d8390ebf1c821b13ee721255b21d6174b9dfa 100644 (file)
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -837,6 +837,7 @@ static void svc_udp_init(struct svc_sock *svsk, struct svc_serv *serv)
        /* data might have come in before data_ready set up */
        set_bit(XPT_DATA, &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 */
        switch (svsk->sk_sk->sk_family) {
@@ -1357,6 +1358,7 @@ static void svc_tcp_init(struct svc_sock *svsk, struct svc_serv *serv)
        if (sk->sk_state == TCP_LISTEN) {
                strcpy(svsk->sk_xprt.xpt_remotebuf, "listener");
                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;
                set_bit(XPT_CONN, &svsk->sk_xprt.xpt_flags);
        } else {