tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

smb: client: Convert to new uid/gid option parsing helpers

Convert to new uid/gid option parsing helpers

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Link: https://lore.kernel.org/r/2543358a-b97e-45ce-8cdc-3de1dd9a782f@redhat.com
Signed-off-by: Christian Brauner <brauner@kernel.org>

authored by

Eric Sandeen and committed by
Christian Brauner 3229e3a5 2ec07010

+12 -27
+12 -27
fs/smb/client/fs_context.c
··· 128 128 fsparam_flag("compress", Opt_compress), 129 129 fsparam_flag("witness", Opt_witness), 130 130 131 + /* Mount options which take uid or gid */ 132 + fsparam_uid("backupuid", Opt_backupuid), 133 + fsparam_gid("backupgid", Opt_backupgid), 134 + fsparam_uid("uid", Opt_uid), 135 + fsparam_uid("cruid", Opt_cruid), 136 + fsparam_gid("gid", Opt_gid), 137 + 131 138 /* Mount options which take numeric value */ 132 - fsparam_u32("backupuid", Opt_backupuid), 133 - fsparam_u32("backupgid", Opt_backupgid), 134 - fsparam_u32("uid", Opt_uid), 135 - fsparam_u32("cruid", Opt_cruid), 136 - fsparam_u32("gid", Opt_gid), 137 139 fsparam_u32("file_mode", Opt_file_mode), 138 140 fsparam_u32("dirmode", Opt_dirmode), 139 141 fsparam_u32("dir_mode", Opt_dirmode), ··· 953 951 int i, opt; 954 952 bool is_smb3 = !strcmp(fc->fs_type->name, "smb3"); 955 953 bool skip_parsing = false; 956 - kuid_t uid; 957 - kgid_t gid; 958 954 959 955 cifs_dbg(FYI, "CIFS: parsing cifs mount option '%s'\n", param->key); 960 956 ··· 1083 1083 } 1084 1084 break; 1085 1085 case Opt_uid: 1086 - uid = make_kuid(current_user_ns(), result.uint_32); 1087 - if (!uid_valid(uid)) 1088 - goto cifs_parse_mount_err; 1089 - ctx->linux_uid = uid; 1086 + ctx->linux_uid = result.uid; 1090 1087 ctx->uid_specified = true; 1091 1088 break; 1092 1089 case Opt_cruid: 1093 - uid = make_kuid(current_user_ns(), result.uint_32); 1094 - if (!uid_valid(uid)) 1095 - goto cifs_parse_mount_err; 1096 - ctx->cred_uid = uid; 1090 + ctx->cred_uid = result.uid; 1097 1091 ctx->cruid_specified = true; 1098 1092 break; 1099 1093 case Opt_backupuid: 1100 - uid = make_kuid(current_user_ns(), result.uint_32); 1101 - if (!uid_valid(uid)) 1102 - goto cifs_parse_mount_err; 1103 - ctx->backupuid = uid; 1094 + ctx->backupuid = result.uid; 1104 1095 ctx->backupuid_specified = true; 1105 1096 break; 1106 1097 case Opt_backupgid: 1107 - gid = make_kgid(current_user_ns(), result.uint_32); 1108 - if (!gid_valid(gid)) 1109 - goto cifs_parse_mount_err; 1110 - ctx->backupgid = gid; 1098 + ctx->backupgid = result.gid; 1111 1099 ctx->backupgid_specified = true; 1112 1100 break; 1113 1101 case Opt_gid: 1114 - gid = make_kgid(current_user_ns(), result.uint_32); 1115 - if (!gid_valid(gid)) 1116 - goto cifs_parse_mount_err; 1117 - ctx->linux_gid = gid; 1102 + ctx->linux_gid = result.gid; 1118 1103 ctx->gid_specified = true; 1119 1104 break; 1120 1105 case Opt_port: