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

Commit 0cb2659b authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust
Browse files

NLM: allow lockd requests from an unprivileged port 



If the admin has specified the "noresvport" option for an NFS mount
point, the kernel's NFS client uses an unprivileged source port for
the main NFS transport.  The kernel's lockd client should use an
unprivileged port in this case as well.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 50a737f8

fs/lockd/clntlock.c

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ struct nlm_host *nlmclnt_init(const struct nlmclnt_initdata *nlm_init) 


	host = nlmclnt_lookup_host(nlm_init->address, nlm_init->addrlen,

				   nlm_init->protocol, nlm_version,

				   nlm_init->hostname);

				   nlm_init->hostname, nlm_init->noresvport);

	if (host == NULL) {

		lockd_down();

		return ERR_PTR(-ENOLCK);

fs/lockd/host.c

+9 −1
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ struct nlm_lookup_host_info { 
	const size_t		hostname_len;	/* it's length */

	const struct sockaddr	*src_sap;	/* our address (optional) */

	const size_t		src_len;	/* it's length */

	const int		noresvport;	/* use non-priv port */

};



/*
@@ -222,6 +223,7 @@ static struct nlm_host *nlm_lookup_host(struct nlm_lookup_host_info *ni) 
	host->h_nsmstate   = 0;			/* real NSM state */

	host->h_nsmhandle  = nsm;

	host->h_server	   = ni->server;

	host->h_noresvport = ni->noresvport;

	hlist_add_head(&host->h_hash, chain);

	INIT_LIST_HEAD(&host->h_lockowners);

	spin_lock_init(&host->h_lock);
@@ -272,6 +274,7 @@ nlm_destroy_host(struct nlm_host *host) 
 * @protocol: transport protocol to use

 * @version: NLM protocol version

 * @hostname: '\0'-terminated hostname of server

 * @noresvport: 1 if non-privileged port should be used

 *

 * Returns an nlm_host structure that matches the passed-in

 * [server address, transport protocol, NLM version, server hostname].
@@ -281,7 +284,9 @@ nlm_destroy_host(struct nlm_host *host) 
struct nlm_host *nlmclnt_lookup_host(const struct sockaddr *sap,

				     const size_t salen,

				     const unsigned short protocol,

				     const u32 version, const char *hostname)

				     const u32 version,

				     const char *hostname,

				     int noresvport)

{

	const struct sockaddr source = {

		.sa_family	= AF_UNSPEC,
@@ -296,6 +301,7 @@ struct nlm_host *nlmclnt_lookup_host(const struct sockaddr *sap, 
		.hostname_len	= strlen(hostname),

		.src_sap	= &source,

		.src_len	= sizeof(source),

		.noresvport	= noresvport,

	};



	dprintk("lockd: %s(host='%s', vers=%u, proto=%s)\n", __func__,
@@ -417,6 +423,8 @@ nlm_bind_host(struct nlm_host *host) 
		 */

		if (!host->h_server)

			args.flags |= RPC_CLNT_CREATE_HARDRTRY;

		if (host->h_noresvport)

			args.flags |= RPC_CLNT_CREATE_NONPRIVPORT;



		clnt = rpc_create(&args);

		if (!IS_ERR(clnt))

fs/nfs/client.c

+2 −0
Original line number Diff line number Diff line
@@ -526,6 +526,8 @@ static int nfs_start_lockd(struct nfs_server *server) 
		.protocol	= server->flags & NFS_MOUNT_TCP ?

						IPPROTO_TCP : IPPROTO_UDP,

		.nfs_version	= clp->rpc_ops->version,

		.noresvport	= server->flags & NFS_MOUNT_NORESVPORT ?

					1 : 0,

	};



	if (nlm_init.nfs_version > 3)

include/linux/lockd/bind.h

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ struct nlmclnt_initdata { 
	size_t			addrlen;

	unsigned short		protocol;

	u32			nfs_version;

	int			noresvport;

};



/*

include/linux/lockd/lockd.h

+3 −1
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ struct nlm_host { 
	unsigned short		h_proto;	/* transport proto */

	unsigned short		h_reclaiming : 1,

				h_server     : 1, /* server side, not client side */

				h_noresvport : 1,

				h_inuse      : 1;

	wait_queue_head_t	h_gracewait;	/* wait while reclaiming */

	struct rw_semaphore	h_rwsem;	/* Reboot recovery lock */
@@ -220,7 +221,8 @@ struct nlm_host *nlmclnt_lookup_host(const struct sockaddr *sap, 
					const size_t salen,

					const unsigned short protocol,

					const u32 version,

					const char *hostname);

					const char *hostname,

					int noresvport);

struct nlm_host  *nlmsvc_lookup_host(const struct svc_rqst *rqstp,

					const char *hostname,

					const size_t hostname_len);