Skip to content

Commit

Permalink
NFS: Clean up: copy hostname with kstrndup during mount processing
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Chuck Lever authored and Trond Myklebust committed Jan 30, 2008
1 parent e887cbc commit 6a0ed1d
Showing 1 changed file with 4 additions and 9 deletions.
13 changes: 4 additions & 9 deletions fs/nfs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -1648,21 +1648,16 @@ static int nfs4_validate_mount_data(void *options,
len = c - dev_name;
if (len > NFS4_MAXNAMLEN)
return -ENAMETOOLONG;
args->nfs_server.hostname = kzalloc(len, GFP_KERNEL);
if (args->nfs_server.hostname == NULL)
return -ENOMEM;
strncpy(args->nfs_server.hostname, dev_name, len - 1);
/* N.B. caller will free nfs_server.hostname in all cases */
args->nfs_server.hostname = kstrndup(dev_name, len, GFP_KERNEL);

c++; /* step over the ':' */
len = strlen(c);
if (len > NFS4_MAXPATHLEN)
return -ENAMETOOLONG;
args->nfs_server.export_path = kzalloc(len + 1, GFP_KERNEL);
if (args->nfs_server.export_path == NULL)
return -ENOMEM;
strncpy(args->nfs_server.export_path, c, len);
args->nfs_server.export_path = kstrndup(c, len, GFP_KERNEL);

dprintk("MNTPATH: %s\n", args->nfs_server.export_path);
dprintk("NFS: MNTPATH: '%s'\n", args->nfs_server.export_path);

if (args->client_address == NULL)
goto out_no_client_address;
Expand Down

0 comments on commit 6a0ed1d

Please sign in to comment.