Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6fb3f6f authored by Chuck Lever's avatar Chuck Lever Committed by J. Bruce Fields
Browse files

SUNRPC: Fix up svc_unregister() 



With the new rpcbind code, a PMAP_UNSET will not have any effect on
services registered via rpcbind v3 or v4.

Implement a version of svc_unregister() that uses an RPCB_UNSET with
an empty netid string to make sure we have cleared *all* entries for
a kernel RPC service when shutting down, or before starting a fresh
instance of the service.

Use the new version only when CONFIG_SUNRPC_REGISTER_V4 is enabled;
otherwise, the legacy PMAP version is used to ensure complete
backwards-compatibility with the Linux portmapper daemon.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent 9d548b9c

net/sunrpc/svc.c

+38 −20
Original line number Original line Diff line number Diff line
@@ -896,31 +896,51 @@ int svc_register(const struct svc_serv *serv, const unsigned short proto, 
	return error;

	return error;

}

}





#ifdef CONFIG_SUNRPC_REGISTER_V4



static void __svc_unregister(const u32 program, const u32 version,

			     const char *progname)

{

	struct sockaddr_in6 sin6 = {

		.sin6_family		= AF_INET6,

		.sin6_addr		= IN6ADDR_ANY_INIT,

		.sin6_port		= 0,

	};

	int error;



	error = rpcb_v4_register(program, version,

				(struct sockaddr *)&sin6, "");

	dprintk("svc: %s(%sv%u), error %d\n",

			__func__, progname, version, error);

}



#else	/* CONFIG_SUNRPC_REGISTER_V4 */



static void __svc_unregister(const u32 program, const u32 version,

			     const char *progname)

{

	int error;



	error = rpcb_register(program, version, 0, 0);

	dprintk("svc: %s(%sv%u), error %d\n",

			__func__, progname, version, error);

}



#endif	/* CONFIG_SUNRPC_REGISTER_V4 */



/*

/*

 * All transport protocols and ports for this service are removed

 * All netids, bind addresses and ports registered for [program, version]

 * from the local rpcbind database if the service is not hidden.

 * are removed from the local rpcbind database (if the service is not

 *

 * hidden) to make way for a new instance of the service.

 * The result of unregistration is reported via dprintk for those

 * who want verification of the result, but is otherwise not

 * important.

 *

 *

 * The local rpcbind daemon listens on either only IPv6 or only

 * The result of unregistration is reported via dprintk for those who want

 * IPv4.  The kernel can't tell how it's configured.  However,

 * verification of the result, but is otherwise not important.

 * AF_INET addresses are mapped to AF_INET6 in IPv6-only config-

 * urations, so even an unregistration request on AF_INET will

 * get to a local rpcbind daemon listening only on AF_INET6.  So

 * we always unregister via AF_INET.

 *

 * At this point we don't need rpcbind version 4 for unregis-

 * tration:  A v2 UNSET request will clear all transports (netids),

 * addresses, and address families for [program, version].

 */

 */

static void svc_unregister(const struct svc_serv *serv)

static void svc_unregister(const struct svc_serv *serv)

{

{

	struct svc_program *progp;

	struct svc_program *progp;

	unsigned long flags;

	unsigned long flags;

	unsigned int i;

	unsigned int i;

	int error;





	clear_thread_flag(TIF_SIGPENDING);

	clear_thread_flag(TIF_SIGPENDING);
@@ -931,9 +951,7 @@ static void svc_unregister(const struct svc_serv *serv) 
			if (progp->pg_vers[i]->vs_hidden)

			if (progp->pg_vers[i]->vs_hidden)

				continue;

				continue;





			error = rpcb_register(progp->pg_prog, i, 0, 0);

			__svc_unregister(progp->pg_prog, i, progp->pg_name);

			dprintk("svc: svc_unregister(%sv%u), error %d\n",

					progp->pg_name, i, error);

		}

		}

	}

	}