redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

NFS: Clean up nfs_validate_mount_data

Browse source 
Move error handling code out of the main code path.  The switch statement
was also improperly indented, according to Documentation/CodingStyle.  This
prepares nfs_validate_mount_data for the addition of option string parsing.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Chuck Lever 2007-07-01 12:12:56 -04:00 committed by Trond Myklebust
parent f18289931d
commit 5df36e78da
1 changed files with 68 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

127
fs/nfs/super.c
View file

@ -470,77 +470,86 @@ static int nfs_verify_server_address(struct sockaddr *addr)
static int nfs_validate_mount_data(struct nfs_mount_data *data, static int nfs_validate_mount_data(struct nfs_mount_data *data,
struct nfs_fh *mntfh) struct nfs_fh *mntfh)
{ {
if (data == NULL) { if (data == NULL)
dprintk("%s: missing data argument\n", __FUNCTION__); goto out_no_data;
return -EINVAL;
}
if (data->version <= 0 || data->version > NFS_MOUNT_VERSION) {
dprintk("%s: bad mount version\n", __FUNCTION__);
return -EINVAL;
}
switch (data->version) { switch (data->version) {
case 1: case 1:
data->namlen = 0; data->namlen = 0;
case 2: case 2:
data->bsize = 0; data->bsize = 0;
case 3: case 3:
if (data->flags & NFS_MOUNT_VER3) { if (data->flags & NFS_MOUNT_VER3)
dprintk("%s: mount structure version %d does not support NFSv3\n", goto out_no_v3;
__FUNCTION__, data->root.size = NFS2_FHSIZE;
data->version); memcpy(data->root.data, data->old_root.data, NFS2_FHSIZE);
return -EINVAL; case 4:
} if (data->flags & NFS_MOUNT_SECFLAVOUR)
data->root.size = NFS2_FHSIZE; goto out_no_sec;
memcpy(data->root.data, data->old_root.data, NFS2_FHSIZE); case 5:
case 4: memset(data->context, 0, sizeof(data->context));
if (data->flags & NFS_MOUNT_SECFLAVOUR) { case 6:
dprintk("%s: mount structure version %d does not support strong security\n", if (data->flags & NFS_MOUNT_VER3)
__FUNCTION__, mntfh->size = data->root.size;
data->version); else
return -EINVAL; mntfh->size = NFS2_FHSIZE;
}
case 5: if (mntfh->size > sizeof(mntfh->data))
memset(data->context, 0, sizeof(data->context)); goto out_invalid_fh;
memcpy(mntfh->data, data->root.data, mntfh->size);
if (mntfh->size < sizeof(mntfh->data))
memset(mntfh->data + mntfh->size, 0,
sizeof(mntfh->data) - mntfh->size);
break;
default:
goto out_bad_version;
} }
/* Set the pseudoflavor */
if (!(data->flags & NFS_MOUNT_SECFLAVOUR)) if (!(data->flags & NFS_MOUNT_SECFLAVOUR))
data->pseudoflavor = RPC_AUTH_UNIX; data->pseudoflavor = RPC_AUTH_UNIX;
#ifndef CONFIG_NFS_V3 #ifndef CONFIG_NFS_V3
/* If NFSv3 is not compiled in, return -EPROTONOSUPPORT */
if (data->flags & NFS_MOUNT_VER3) {
dprintk("%s: NFSv3 not compiled into kernel\n", __FUNCTION__);
return -EPROTONOSUPPORT;
}
#endif /* CONFIG_NFS_V3 */
/* We now require that the mount process passes the remote address */
if (!nfs_verify_server_address((struct sockaddr *) &data->addr)) {
dprintk("%s: mount program didn't pass remote address!\n",
__FUNCTION__);
return -EINVAL;
}
/* Prepare the root filehandle */
if (data->flags & NFS_MOUNT_VER3) if (data->flags & NFS_MOUNT_VER3)
mntfh->size = data->root.size; goto out_v3_not_compiled;
else #endif /* !CONFIG_NFS_V3 */
mntfh->size = NFS2_FHSIZE;
if (mntfh->size > sizeof(mntfh->data)) { if (!nfs_verify_server_address((struct sockaddr *) &data->addr))
dprintk("%s: invalid root filehandle\n", __FUNCTION__); goto out_no_address;
return -EINVAL;
}
memcpy(mntfh->data, data->root.data, mntfh->size);
if (mntfh->size < sizeof(mntfh->data))
memset(mntfh->data + mntfh->size, 0,
sizeof(mntfh->data) - mntfh->size);
return 0; return 0;
out_no_data:
dfprintk(MOUNT, "NFS: mount program didn't pass any mount data\n");
return -EINVAL;
out_no_v3:
dfprintk(MOUNT, "NFS: nfs_mount_data version %d does not support v3\n",
data->version);
return -EINVAL;
out_no_sec:
dfprintk(MOUNT, "NFS: nfs_mount_data version supports only AUTH_SYS\n");
return -EINVAL;
out_bad_version:
dfprintk(MOUNT, "NFS: bad nfs_mount_data version %d\n",
data->version);
return -EINVAL;
#ifndef CONFIG_NFS_V3
out_v3_not_compiled:
dfprintk(MOUNT, "NFS: NFSv3 is not compiled into kernel\n");
return -EPROTONOSUPPORT;
#endif /* !CONFIG_NFS_V3 */
out_no_address:
dfprintk(MOUNT, "NFS: mount program didn't pass remote address\n");
return -EINVAL;
out_invalid_fh:
dfprintk(MOUNT, "NFS: invalid root filehandle\n");
return -EINVAL;
} }
/* /*