diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2007-12-10 14:57:45 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-01-30 02:05:53 -0500 |
| commit | cdcd7f9abc8c95524376835fbe8e11c5f7bf588e (patch) | |
| tree | 574eb3c74a70e7b872d971b262ca1f13abce2002 | |
| parent | fd00a8ff8e37815c9df49f5cf09786e441e1396b (diff) | |
| download | blackbird-op-linux-cdcd7f9abc8c95524376835fbe8e11c5f7bf588e.tar.gz blackbird-op-linux-cdcd7f9abc8c95524376835fbe8e11c5f7bf588e.zip | |
NFS: Verify IPv6 addresses properly
Add support to nfs_verify_server_address for recognizing AF_INET6
addresses.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
| -rw-r--r-- | fs/nfs/super.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index c3d8fcf38523..038b20b38b22 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -600,16 +600,21 @@ static void nfs_umount_begin(struct vfsmount *vfsmnt, int flags) } /* - * Sanity-check a server address provided by the mount command + * Sanity-check a server address provided by the mount command. + * + * Address family must be initialized, and address must not be + * the ANY address for that family. */ static int nfs_verify_server_address(struct sockaddr *addr) { switch (addr->sa_family) { case AF_INET: { - struct sockaddr_in *sa = (struct sockaddr_in *) addr; - if (sa->sin_addr.s_addr != INADDR_ANY) - return 1; - break; + struct sockaddr_in *sa = (struct sockaddr_in *)addr; + return sa->sin_addr.s_addr != INADDR_ANY; + } + case AF_INET6: { + struct in6_addr *sa = &((struct sockaddr_in6 *)addr)->sin6_addr; + return !ipv6_addr_any(sa); } } |
