Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-10 07:00:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

NFS: Clean up: copy hostname with kstrndup during mount processing

Browse Source 
Clean up: mount option parsing uses kstrndup in several places, rather than
using kzalloc.  Replace the few remaining uses of kzalloc with kstrndup,
for consistency.

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-10-26 13:32:40 -04:00 committed by Trond Myklebust
parent e887cbcf91
commit 6a0ed1de8e
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fs/nfs/super.c
View File

@ -1648,21 +1648,16 @@ static int nfs4_validate_mount_data(void *options,
len = c - dev_name; len = c - dev_name;
if (len > NFS4_MAXNAMLEN) if (len > NFS4_MAXNAMLEN)
return -ENAMETOOLONG; return -ENAMETOOLONG;
args->nfs_server.hostname = kzalloc(len, GFP_KERNEL); /* N.B. caller will free nfs_server.hostname in all cases */
if (args->nfs_server.hostname == NULL) args->nfs_server.hostname = kstrndup(dev_name, len, GFP_KERNEL);
return -ENOMEM;
strncpy(args->nfs_server.hostname, dev_name, len - 1);
c++; /* step over the ':' */ c++; /* step over the ':' */
len = strlen(c); len = strlen(c);
if (len > NFS4_MAXPATHLEN) if (len > NFS4_MAXPATHLEN)
return -ENAMETOOLONG; return -ENAMETOOLONG;
args->nfs_server.export_path = kzalloc(len + 1, GFP_KERNEL); args->nfs_server.export_path = kstrndup(c, len, GFP_KERNEL);
if (args->nfs_server.export_path == NULL)
return -ENOMEM;
strncpy(args->nfs_server.export_path, c, len);
dprintk("MNTPATH: %s\n", args->nfs_server.export_path); dprintk("NFS: MNTPATH: '%s'\n", args->nfs_server.export_path);
if (args->client_address == NULL) if (args->client_address == NULL)
goto out_no_client_address; goto out_no_client_address;