aboutsummaryrefslogtreecommitdiffstats
path: root/fs/lockd
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2008-12-05 19:03:01 -0500
committerJ. Bruce Fields <bfields@citi.umich.edu>2009-01-06 11:53:53 -0500
commitbc1cc6c4e476b60df48227165990c87a22db6bb7 (patch)
tree19919f4787df34201bd575ebf741a53e9879e084 /fs/lockd
parent5cf1c4b19db99d21d44c2ab457cfd44eb86b4439 (diff)
NSM: Remove NULL pointer check from nsm_find()
The nsm_find() function should never be called with a NULL IP address pointer. If it is, that's a bug. Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'fs/lockd')
-rw-r--r--fs/lockd/mon.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c
index 38255455563d..0a066a13478e 100644
--- a/fs/lockd/mon.c
+++ b/fs/lockd/mon.c
@@ -224,9 +224,6 @@ struct nsm_handle *nsm_find(const struct sockaddr *sap, const size_t salen,
224 struct nsm_handle *nsm = NULL; 224 struct nsm_handle *nsm = NULL;
225 struct nsm_handle *pos; 225 struct nsm_handle *pos;
226 226
227 if (!sap)
228 return NULL;
229
230 if (hostname && memchr(hostname, '/', hostname_len) != NULL) { 227 if (hostname && memchr(hostname, '/', hostname_len) != NULL) {
231 if (printk_ratelimit()) { 228 if (printk_ratelimit()) {
232 printk(KERN_WARNING "Invalid hostname \"%.*s\" " 229 printk(KERN_WARNING "Invalid hostname \"%.*s\" "