Piteball/android_kernel_samsung_msm8976
1
1
Fork 0
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git synced 2024-09-21 11:53:01 +00:00
Code Issues Projects Releases Wiki Activity

NFS: Clean-up: Refactor IP address sanity checks in NFS client

Browse source 
NFS and NFSv4 mounts can now share server address sanity checking.  And, it
provides an easy mechanism for adding IPv6 address checking at some later
point.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Cc: Aurelien Charbon <aurelien.charbon@ext.bull.net>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Chuck Lever 2007-07-01 12:12:46 -04:00 committed by Trond Myklebust
parent 4d81cd1611
commit fc50d58fd0
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
fs/nfs/super.c
View file

@ -446,6 +446,23 @@ static void nfs_umount_begin(struct vfsmount *vfsmnt, int flags)
rpc_killall_tasks(rpc);
}
/*
* Sanity-check a server address provided by the mount command
*/
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;
}
}
return 0;
}
/*
* Validate the NFS2/NFS3 mount data
* - fills in the mount root filehandle
@ -501,7 +518,7 @@ static int nfs_validate_mount_data(struct nfs_mount_data *data,
#endif /* CONFIG_NFS_V3 */
/* We now require that the mount process passes the remote address */
if (data->addr.sin_addr.s_addr == INADDR_ANY) {
if (!nfs_verify_server_address((struct sockaddr *) &data->addr)) {
dprintk("%s: mount program didn't pass remote address!\n",
__FUNCTION__);
return -EINVAL;
@ -819,13 +836,12 @@ static int nfs4_get_sb(struct file_system_type *fs_type,
if (copy_from_user(&addr, data->host_addr, sizeof(addr)))
return -EFAULT;
if (addr.sin_family != AF_INET ||
addr.sin_addr.s_addr == INADDR_ANY
) {
if (!nfs_verify_server_address((struct sockaddr *) &addr)) {
dprintk("%s: mount program didn't pass remote IP address!\n",
__FUNCTION__);
return -EINVAL;
}
/* RFC3530: The default port for NFS is 2049 */
if (addr.sin_port == 0)
addr.sin_port = htons(NFS_PORT);