Commit 8d767223 authored by Al Viro's avatar Al Viro Committed by Steve French
Browse files

cifs: don't cargo-cult strndup() 



strndup(s, strlen(s)) is a highly unidiomatic way to spell strdup(s);
it's *NOT* safer in any way, since strlen() is just as sensitive to
NUL-termination as strdup() is.

strndup() is for situations when you need a copy of a known-sized
substring, not a magic security juju to drive the bad spirits away.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent b9335f62

fs/cifs/cifs_dfs_ref.c

+1 −1
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ static struct vfsmount *cifs_dfs_do_mount(struct dentry *mntpt, 
	char *mountdata;

	char *devname;



	devname = kstrndup(fullpath, strlen(fullpath), GFP_KERNEL);

	devname = kstrdup(fullpath, GFP_KERNEL);

	if (!devname)

		return ERR_PTR(-ENOMEM);

fs/cifs/connect.c

+3 −6
Original line number Diff line number Diff line
@@ -1778,9 +1778,7 @@ cifs_set_cifscreds(struct smb3_fs_context *ctx, struct cifs_ses *ses) 
	 * for the request.

	 */

	if (is_domain && ses->domainName) {

		ctx->domainname = kstrndup(ses->domainName,

					   strlen(ses->domainName),

					   GFP_KERNEL);

		ctx->domainname = kstrdup(ses->domainName, GFP_KERNEL);

		if (!ctx->domainname) {

			cifs_dbg(FYI, "Unable to allocate %zd bytes for domain\n",

				 len);
@@ -3411,8 +3409,7 @@ int cifs_mount(struct cifs_sb_info *cifs_sb, struct smb3_fs_context *ctx) 
			goto error;

	}

	/* Save mount options */

	mntdata = kstrndup(cifs_sb->ctx->mount_options,

			   strlen(cifs_sb->ctx->mount_options), GFP_KERNEL);

	mntdata = kstrdup(cifs_sb->ctx->mount_options, GFP_KERNEL);

	if (!mntdata) {

		rc = -ENOMEM;

		goto error;
@@ -3485,7 +3482,7 @@ int cifs_mount(struct cifs_sb_info *cifs_sb, struct smb3_fs_context *ctx) 
	 * links, the prefix path is included in both and may be changed during reconnect.  See

	 * cifs_tree_connect().

	 */

	cifs_sb->origin_fullpath = kstrndup(full_path, strlen(full_path), GFP_KERNEL);

	cifs_sb->origin_fullpath = kstrdup(full_path, GFP_KERNEL);

	if (!cifs_sb->origin_fullpath) {

		rc = -ENOMEM;

		goto error;

fs/cifs/dfs_cache.c

+9 −9
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static int get_normalized_path(const char *path, char **npath) 
	if (*path == '\\') {

		*npath = (char *)path;

	} else {

		*npath = kstrndup(path, strlen(path), GFP_KERNEL);

		*npath = kstrdup(path, GFP_KERNEL);

		if (!*npath)

			return -ENOMEM;

		convert_delimiter(*npath, '\\');
@@ -358,7 +358,7 @@ static struct cache_dfs_tgt *alloc_target(const char *name, int path_consumed) 
	t = kmalloc(sizeof(*t), GFP_ATOMIC);

	if (!t)

		return ERR_PTR(-ENOMEM);

	t->name = kstrndup(name, strlen(name), GFP_ATOMIC);

	t->name = kstrdup(name, GFP_ATOMIC);

	if (!t->name) {

		kfree(t);

		return ERR_PTR(-ENOMEM);
@@ -419,7 +419,7 @@ static struct cache_entry *alloc_cache_entry(const char *path, 
	if (!ce)

		return ERR_PTR(-ENOMEM);



	ce->path = kstrndup(path, strlen(path), GFP_KERNEL);

	ce->path = kstrdup(path, GFP_KERNEL);

	if (!ce->path) {

		kmem_cache_free(cache_slab, ce);

		return ERR_PTR(-ENOMEM);
@@ -531,7 +531,7 @@ static struct cache_entry *lookup_cache_entry(const char *path, unsigned int *ha 
	char *s, *e;

	char sep;



	npath = kstrndup(path, strlen(path), GFP_KERNEL);

	npath = kstrdup(path, GFP_KERNEL);

	if (!npath)

		return ERR_PTR(-ENOMEM);
@@ -641,7 +641,7 @@ static int __update_cache_entry(const char *path, 


	if (ce->tgthint) {

		s = ce->tgthint->name;

		th = kstrndup(s, strlen(s), GFP_ATOMIC);

		th = kstrdup(s, GFP_ATOMIC);

		if (!th)

			return -ENOMEM;

	}
@@ -786,11 +786,11 @@ static int setup_referral(const char *path, struct cache_entry *ce, 


	memset(ref, 0, sizeof(*ref));



	ref->path_name = kstrndup(path, strlen(path), GFP_ATOMIC);

	ref->path_name = kstrdup(path, GFP_ATOMIC);

	if (!ref->path_name)

		return -ENOMEM;



	ref->node_name = kstrndup(target, strlen(target), GFP_ATOMIC);

	ref->node_name = kstrdup(target, GFP_ATOMIC);

	if (!ref->node_name) {

		rc = -ENOMEM;

		goto err_free_path;
@@ -828,7 +828,7 @@ static int get_targets(struct cache_entry *ce, struct dfs_cache_tgt_list *tl) 
			goto err_free_it;

		}



		it->it_name = kstrndup(t->name, strlen(t->name), GFP_ATOMIC);

		it->it_name = kstrdup(t->name, GFP_ATOMIC);

		if (!it->it_name) {

			kfree(it);

			rc = -ENOMEM;
@@ -1166,7 +1166,7 @@ int dfs_cache_add_vol(char *mntdata, struct smb3_fs_context *ctx, const char *fu 
	if (!vi)

		return -ENOMEM;



	vi->fullpath = kstrndup(fullpath, strlen(fullpath), GFP_KERNEL);

	vi->fullpath = kstrdup(fullpath, GFP_KERNEL);

	if (!vi->fullpath) {

		rc = -ENOMEM;

		goto err_free_vi;

fs/cifs/fs_context.c

+1 −1
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ int smb3_parse_opt(const char *options, const char *key, char **val) 
			if (nval == p)

				continue;

			*nval++ = 0;

			*val = kstrndup(nval, strlen(nval), GFP_KERNEL);

			*val = kstrdup(nval, GFP_KERNEL);

			rc = !*val ? -ENOMEM : 0;

			goto out;

		}

fs/cifs/misc.c

+1 −1
Original line number Diff line number Diff line
@@ -1180,7 +1180,7 @@ int update_super_prepath(struct cifs_tcon *tcon, char *prefix) 
	kfree(cifs_sb->prepath);



	if (prefix && *prefix) {

		cifs_sb->prepath = kstrndup(prefix, strlen(prefix), GFP_ATOMIC);

		cifs_sb->prepath = kstrdup(prefix, GFP_ATOMIC);

		if (!cifs_sb->prepath) {

			rc = -ENOMEM;

			goto out;