Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5167f11e authored by Sean Finney's avatar Sean Finney Committed by Steve French
Browse files

cifs: Use kstrndup for cifs_sb->mountdata 



A relatively minor nit, but also clarified the "consensus" from the
preceding comments that it is in fact better to try for the kstrdup
early and cleanup while cleaning up is still a simple thing to do.

Reviewed-By: default avatarSteve French <smfrench@gmail.com>
Signed-off-by: default avatarSean Finney <seanius@seanius.net>
Signed-off-by: default avatarPavel Shilovsky <piastry@etersoft.ru>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent 046462ab

fs/cifs/cifsfs.c

+6 −11
Original line number Diff line number Diff line
@@ -129,24 +129,19 @@ cifs_read_super(struct super_block *sb, void *data, 
	cifs_sb->bdi.ra_pages = default_backing_dev_info.ra_pages;



#ifdef CONFIG_CIFS_DFS_UPCALL

	/* copy mount params to sb for use in submounts */

	/* BB: should we move this after the mount so we

	 * do not have to do the copy on failed mounts?

	 * BB: May be it is better to do simple copy before

	 * complex operation (mount), and in case of fail

	 * just exit instead of doing mount and attempting

	 * undo it if this copy fails?*/

	/*

	 * Copy mount params to sb for use in submounts. Better to do

	 * the copy here and deal with the error before cleanup gets

	 * complicated post-mount.

	 */

	if (data) {

		int len = strlen(data);

		cifs_sb->mountdata = kzalloc(len + 1, GFP_KERNEL);

		cifs_sb->mountdata = kstrndup(data, PAGE_SIZE, GFP_KERNEL);

		if (cifs_sb->mountdata == NULL) {

			bdi_destroy(&cifs_sb->bdi);

			kfree(sb->s_fs_info);

			sb->s_fs_info = NULL;

			return -ENOMEM;

		}

		strncpy(cifs_sb->mountdata, data, len + 1);

		cifs_sb->mountdata[len] = '\0';

	}

#endif