Commit e0a3cbcd authored by Ronnie Sahlberg's avatar Ronnie Sahlberg Committed by Steve French
Browse files

cifs: use helpers when parsing uid/gid mount options and validate them 



Use the nice helpers to initialize and the uid/gid/cred_uid when passed as mount arguments.

Signed-off-by: default avatarRonnie Sahlberg <lsahlber@redhat.com>
Acked-by: default avatarPavel Shilovsky <pshilovsky@samba.org>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent d4dc277c

fs/cifs/fs_context.c

+19 −5
Original line number Diff line number Diff line
@@ -322,7 +322,6 @@ smb3_fs_context_dup(struct smb3_fs_context *new_ctx, struct smb3_fs_context *ctx 
	new_ctx->UNC = NULL;

	new_ctx->source = NULL;

	new_ctx->iocharset = NULL;



	/*

	 * Make sure to stay in sync with smb3_cleanup_fs_context_contents()

	 */
@@ -792,6 +791,8 @@ static int smb3_fs_context_parse_param(struct fs_context *fc, 
	int i, opt;

	bool is_smb3 = !strcmp(fc->fs_type->name, "smb3");

	bool skip_parsing = false;

	kuid_t uid;

	kgid_t gid;



	cifs_dbg(FYI, "CIFS: parsing cifs mount option '%s'\n", param->key);
@@ -904,18 +905,31 @@ static int smb3_fs_context_parse_param(struct fs_context *fc, 
		}

		break;

	case Opt_uid:

		ctx->linux_uid.val = result.uint_32;

		uid = make_kuid(current_user_ns(), result.uint_32);

		if (!uid_valid(uid))

			goto cifs_parse_mount_err;

		ctx->linux_uid = uid;

		ctx->uid_specified = true;

		break;

	case Opt_cruid:

		ctx->cred_uid.val = result.uint_32;

		uid = make_kuid(current_user_ns(), result.uint_32);

		if (!uid_valid(uid))

			goto cifs_parse_mount_err;

		ctx->cred_uid = uid;

		ctx->cruid_specified = true;

		break;

	case Opt_backupgid:

		ctx->backupgid.val = result.uint_32;

		gid = make_kgid(current_user_ns(), result.uint_32);

		if (!gid_valid(gid))

			goto cifs_parse_mount_err;

		ctx->backupgid = gid;

		ctx->backupgid_specified = true;

		break;

	case Opt_gid:

		ctx->linux_gid.val = result.uint_32;

		gid = make_kgid(current_user_ns(), result.uint_32);

		if (!gid_valid(gid))

			goto cifs_parse_mount_err;

		ctx->linux_gid = gid;

		ctx->gid_specified = true;

		break;

	case Opt_port:

fs/cifs/fs_context.h

+1 −0
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ enum cifs_param { 


struct smb3_fs_context {

	bool uid_specified;

	bool cruid_specified;

	bool gid_specified;

	bool sloppy;

	bool got_ip;