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

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

NLM: Rewrite IPv4 privileged requester's check 



Clean up.

For consistency, rewrite the IPv4 check to match the same style as the
new IPv6 check.  Note that ipv4_is_loopback() is somewhat broader in
its interpretation of what is a loopback address than simply
"127.0.0.1".

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

include/linux/lockd/lockd.h

+5 −2
Original line number Diff line number Diff line
@@ -291,8 +291,11 @@ static inline struct inode *nlmsvc_file_inode(struct nlm_file *file) 
static inline int __nlm_privileged_request4(const struct sockaddr *sap)

{

	const struct sockaddr_in *sin = (struct sockaddr_in *)sap;

	return (sin->sin_addr.s_addr == htonl(INADDR_LOOPBACK)) &&

			(ntohs(sin->sin_port) < 1024);



	if (ntohs(sin->sin_port) > 1023)

		return 0;



	return ipv4_is_loopback(sin->sin_addr.s_addr);

}



#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)