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

NLM: Fix sign of length of NLM variable length strings 



According to The Open Group's NLM specification, NLM callers are variable
length strings.  XDR variable length strings use an unsigned 32 bit length.
And internally, negative string lengths are not meaningful for the Linux
NLM implementation.

Clean up: Make nlm_lock.len and nlm_reboot.len unsigned integers.  This
makes the sign of NLM string lengths consistent with the sign of xdr_netobj
lengths.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Acked-By: default avatarNeilBrown <neilb@suse.de>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent e5cff482

fs/lockd/host.c

+11 −8
Original line number Diff line number Diff line
@@ -34,10 +34,10 @@ static DEFINE_MUTEX(nlm_host_mutex); 


static void			nlm_gc_hosts(void);

static struct nsm_handle *	__nsm_find(const struct sockaddr_in *,

					const char *, int, int);

					const char *, unsigned int, int);

static struct nsm_handle *	nsm_find(const struct sockaddr_in *sin,

					 const char *hostname,

					 int hostname_len);

					 unsigned int hostname_len);



/*

 * Common host lookup routine for server & client
@@ -45,7 +45,8 @@ static struct nsm_handle * nsm_find(const struct sockaddr_in *sin, 
static struct nlm_host *

nlm_lookup_host(int server, const struct sockaddr_in *sin,

		int proto, int version, const char *hostname,

		int hostname_len, const struct sockaddr_in *ssin)

		unsigned int hostname_len,

		const struct sockaddr_in *ssin)

{

	struct hlist_head *chain;

	struct hlist_node *pos;
@@ -176,7 +177,7 @@ nlm_destroy_host(struct nlm_host *host) 
 */

struct nlm_host *

nlmclnt_lookup_host(const struct sockaddr_in *sin, int proto, int version,

			const char *hostname, int hostname_len)

			const char *hostname, unsigned int hostname_len)

{

	struct sockaddr_in ssin = {0};
@@ -189,7 +190,7 @@ nlmclnt_lookup_host(const struct sockaddr_in *sin, int proto, int version, 
 */

struct nlm_host *

nlmsvc_lookup_host(struct svc_rqst *rqstp,

			const char *hostname, int hostname_len)

			const char *hostname, unsigned int hostname_len)

{

	struct sockaddr_in ssin = {0};
@@ -307,7 +308,8 @@ void nlm_release_host(struct nlm_host *host) 
 * Release all resources held by that peer.

 */

void nlm_host_rebooted(const struct sockaddr_in *sin,

				const char *hostname, int hostname_len,

				const char *hostname,

				unsigned int hostname_len,

				u32 new_state)

{

	struct hlist_head *chain;
@@ -449,7 +451,7 @@ static DEFINE_MUTEX(nsm_mutex); 


static struct nsm_handle *

__nsm_find(const struct sockaddr_in *sin,

		const char *hostname, int hostname_len,

		const char *hostname, unsigned int hostname_len,

		int create)

{

	struct nsm_handle *nsm = NULL;
@@ -503,7 +505,8 @@ out: 
}



static struct nsm_handle *

nsm_find(const struct sockaddr_in *sin, const char *hostname, int hostname_len)

nsm_find(const struct sockaddr_in *sin, const char *hostname,

	 unsigned int hostname_len)

{

	return __nsm_find(sin, hostname, hostname_len, 1);

}

include/linux/lockd/lockd.h

+6 −3
Original line number Diff line number Diff line
@@ -173,14 +173,17 @@ void nlmclnt_next_cookie(struct nlm_cookie *); 
/*

 * Host cache

 */

struct nlm_host * nlmclnt_lookup_host(const struct sockaddr_in *, int, int, const char *, int);

struct nlm_host * nlmsvc_lookup_host(struct svc_rqst *, const char *, int);

struct nlm_host  *nlmclnt_lookup_host(const struct sockaddr_in *, int, int,

					const char *, unsigned int);

struct nlm_host  *nlmsvc_lookup_host(struct svc_rqst *, const char *,

					unsigned int);

struct rpc_clnt * nlm_bind_host(struct nlm_host *);

void		  nlm_rebind_host(struct nlm_host *);

struct nlm_host * nlm_get_host(struct nlm_host *);

void		  nlm_release_host(struct nlm_host *);

void		  nlm_shutdown_hosts(void);

extern void	  nlm_host_rebooted(const struct sockaddr_in *, const char *, int, u32);

extern void	  nlm_host_rebooted(const struct sockaddr_in *, const char *,

					unsigned int, u32);

void		  nsm_release(struct nsm_handle *);

include/linux/lockd/xdr.h

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ struct svc_rqst; 
/* Lock info passed via NLM */

struct nlm_lock {

	char *			caller;

	int			len; 	/* length of "caller" */

	unsigned int		len; 	/* length of "caller" */

	struct nfs_fh		fh;

	struct xdr_netobj	oh;

	u32			svid;
@@ -78,7 +78,7 @@ struct nlm_res { 
 */

struct nlm_reboot {

	char *		mon;

	int		len;

	unsigned int	len;

	u32		state;

	__be32		addr;

	__be32		vers;

CRA Git | Maintained and supported by SUSTech CRA and CCSE