The patch titled
NFS: more nfs4 in-kernel mount option parsing infrastructure
has been added to the -mm tree. Its filename is
nfs-more-nfs4-in-kernel-mount-option-parsing-infrastructure.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: NFS: more nfs4 in-kernel mount option parsing infrastructure
From: Chuck Lever <chuck.lever@xxxxxxxxxx>
Add function for switching between an nfs4_mount_data structure from user
space (the current nfs4 mount mechanism) and generating an nfs4_mount_data
structure from a text string containing nfs4 mount options.
Signed-off-by: Chuck Lever <chuck.lever@xxxxxxxxxx>
Cc: Trond Myklebust <trond.myklebust@xxxxxxxxxx>
Cc: "J. Bruce Fields" <bfields@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/nfs/super.c | 123 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 123 insertions(+)
diff -puN fs/nfs/super.c~nfs-more-nfs4-in-kernel-mount-option-parsing-infrastructure fs/nfs/super.c
--- a/fs/nfs/super.c~nfs-more-nfs4-in-kernel-mount-option-parsing-infrastructure
+++ a/fs/nfs/super.c
@@ -1691,6 +1691,129 @@ static void *nfs_copy_user_string(char *
return dst;
}
+static int nfs4_validate_mount_data(struct nfs4_mount_data **options,
+ const char *dev_name,
+ struct sockaddr_in *addr,
+ rpc_authflavor_t *authflavour,
+ char **hostname,
+ char **mntpath,
+ char *ip_addr)
+{
+ struct nfs4_mount_data *data = *options;
+ char *c;
+ unsigned len;
+
+ if (data == NULL) {
+ dprintk("%s: missing data argument\n", __FUNCTION__);
+ return -EINVAL;
+ }
+
+ switch (data->version) {
+ case 1:
+ if (data->host_addrlen != sizeof(*addr))
+ return -EINVAL;
+ if (copy_from_user(addr, data->host_addr, sizeof(*addr)))
+ return -EFAULT;
+ if (addr->sin_port == 0)
+ addr->sin_port = htons(NFS_PORT);
+ if (!nfs_verify_server_address((struct sockaddr *) addr,
+ data->host_addrlen))
+ return -EINVAL;
+
+ switch (data->auth_flavourlen) {
+ case 0:
+ *authflavour = RPC_AUTH_UNIX;
+ break;
+ case 1:
+ if (copy_from_user(authflavour, data->auth_flavours,
+ sizeof(*authflavour)))
+ return -EFAULT;
+ default:
+ goto out_inval_auth;
+ }
+
+ c = nfs_copy_user_string(ip_addr, &data->client_addr, 80);
+ if (IS_ERR(c))
+ return PTR_ERR(c);
+
+ c = nfs_copy_user_string(NULL, &data->hostname, 256);
+ if (IS_ERR(c))
+ return PTR_ERR(c);
+ *hostname = c;
+
+ c = nfs_copy_user_string(NULL, &data->mnt_path, 1024);
+ if (IS_ERR(c)) {
+ kfree(*hostname);
+ return PTR_ERR(c);
+ }
+ *mntpath = c;
+ dprintk("MNTPATH: %s\n", *mntpath);
+
+ return 0;
+ default:
+ data = nfs4_convert_mount_opts((char *) data);
+ if (IS_ERR(data))
+ return PTR_ERR(data);
+ *options = data;
+
+ memcpy(addr, data->host_addr, sizeof(*addr));
+ if (!nfs_verify_server_address((struct sockaddr *) addr,
+ data->host_addrlen))
+ return -EINVAL;
+
+ switch (data->auth_flavourlen) {
+ case 0:
+ *authflavour = RPC_AUTH_UNIX;
+ break;
+ case 1:
+ *authflavour = (rpc_authflavor_t) data->auth_flavours[0];
+ break;
+ default:
+ goto out_inval_auth;
+ }
+
+ memset(ip_addr, '\0', data->client_addr.len + 1);
+ strncpy(ip_addr, data->client_addr.data, data->client_addr.len);
+
+ /*
+ * Split "dev_name" into "hostname:mntpath".
+ */
+ c = strchr(dev_name, ':');
+ if (c == NULL)
+ return -EINVAL;
+ /* while calculating len, pretend ':' is '\0' */
+ len = c - dev_name;
+ if (len > 256)
+ return -EINVAL;
+ *hostname = kzalloc(len, GFP_KERNEL);
+ if (*hostname == NULL)
+ return -ENOMEM;
+ strncpy(*hostname, dev_name, len - 1);
+
+ c++; /* step over the ':' */
+ len = strlen(c);
+ if (len > 1023) {
+ kfree(*hostname);
+ return -EINVAL;
+ }
+ *mntpath = kzalloc(len + 1, GFP_KERNEL);
+ if (*mntpath == NULL) {
+ kfree(*hostname);
+ return -ENOMEM;
+ }
+ strncpy(*mntpath, c, len);
+
+ dprintk("MNTPATH: %s\n", *mntpath);
+
+ return 0;
+ }
+
+out_inval_auth:
+ dprintk("NFS4: Invalid number of RPC auth flavours %d\n",
+ data->auth_flavourlen);
+ return -EINVAL;
+}
+
/*
* Finish setting up a cloned NFS4 superblock
*/
_
Patches currently in -mm which might be from chuck.lever@xxxxxxxxxx are
git-nfs.patch
nfs-refactor-ip-address-sanity-checks-in-nfs-client.patch
sunrpc-rename-rpcb_getport_external-routine.patch
sunrpc-rename-rpcb_getport-to-be-consistent-with-new-rpcb_getport_sync-name.patch
nfs-remake-nfsroot_mount-as-a-permanent-part-of-nfs-client.patch
nfs-clean-up-in-kernel-nfs-mount.patch
nfs-improve-debugging-output-in-nfs-in-kernel-mount-client.patch
nfs-new-infrastructure-for-nfs-client-in-kernel-mount-option-parsing.patch
nfs-add-functions-to-parse-nfs-mount-options-to-fs-nfs-superc.patch
nfs-implement-nfsv2-3-in-kernel-mount-option-parsing.patch
nfs-add-functions-to-parse-nfs4-mount-options-to-fs-nfs-superc.patch
nfs-move-nfs_copy_user_string.patch
nfs-more-nfs4-in-kernel-mount-option-parsing-infrastructure.patch
nfs-integrate-support-for-processing-nfs4-mount-options-in-fs-nfs-superc.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
