NFS: Clean up: copy hostname with kstrndup during mount processing
Subsystems (2)
PATCH 23/27 NFS: Clean up: copy hostname with kstrndup during mount processing
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 <[email protected]>
---
fs/nfs/super.c | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-)
fs/nfs/super.c +4 -9
@@ -1642,21 +1642,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;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs