From f22dd9a9a071b5850ec3b22e9bbf153b42ebadcd Mon Sep 17 00:00:00 2001 From: Chuck Lever Date: Thu, 11 Dec 2008 17:56:52 -0500 Subject: [PATCH] --- yaml --- r: 127477 b: refs/heads/master c: 57ef692588bc225853ca3267ca5b7cea2b07e058 h: refs/heads/master i: 127475: d2e994e811af72b51aaf874290255b8211b1a5f2 v: v3 --- [refs] | 2 +- trunk/include/linux/lockd/lockd.h | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index af1d88dcef6e..cea32164528d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1208f70738c91f13b4eadb1b7a694082e439da2 +refs/heads/master: 57ef692588bc225853ca3267ca5b7cea2b07e058 diff --git a/trunk/include/linux/lockd/lockd.h b/trunk/include/linux/lockd/lockd.h index 80d7e8a8257d..aa6fe7026de7 100644 --- a/trunk/include/linux/lockd/lockd.h +++ b/trunk/include/linux/lockd/lockd.h @@ -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)