Commit 6a265845 authored by Eric Sandeen's avatar Eric Sandeen Committed by Christian Brauner

isofs: Convert to new uid/gid option parsing helpers

Convert to new uid/gid option parsing helpers
Signed-off-by: default avatarEric Sandeen <sandeen@redhat.com>
Link: https://lore.kernel.org/r/3e57caa1-33e0-4456-8e07-60922439e479@redhat.comSigned-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent eefc1324
...@@ -326,8 +326,8 @@ static const struct fs_parameter_spec isofs_param_spec[] = { ...@@ -326,8 +326,8 @@ static const struct fs_parameter_spec isofs_param_spec[] = {
fsparam_u32 ("session", Opt_session), fsparam_u32 ("session", Opt_session),
fsparam_u32 ("sbsector", Opt_sb), fsparam_u32 ("sbsector", Opt_sb),
fsparam_enum ("check", Opt_check, isofs_param_check), fsparam_enum ("check", Opt_check, isofs_param_check),
fsparam_u32 ("uid", Opt_uid), fsparam_uid ("uid", Opt_uid),
fsparam_u32 ("gid", Opt_gid), fsparam_gid ("gid", Opt_gid),
/* Note: mode/dmode historically accepted %u not strictly %o */ /* Note: mode/dmode historically accepted %u not strictly %o */
fsparam_u32 ("mode", Opt_mode), fsparam_u32 ("mode", Opt_mode),
fsparam_u32 ("dmode", Opt_dmode), fsparam_u32 ("dmode", Opt_dmode),
...@@ -344,8 +344,6 @@ static int isofs_parse_param(struct fs_context *fc, ...@@ -344,8 +344,6 @@ static int isofs_parse_param(struct fs_context *fc,
struct isofs_options *popt = fc->fs_private; struct isofs_options *popt = fc->fs_private;
struct fs_parse_result result; struct fs_parse_result result;
int opt; int opt;
kuid_t uid;
kgid_t gid;
unsigned int n; unsigned int n;
/* There are no remountable options */ /* There are no remountable options */
...@@ -409,17 +407,11 @@ static int isofs_parse_param(struct fs_context *fc, ...@@ -409,17 +407,11 @@ static int isofs_parse_param(struct fs_context *fc,
case Opt_ignore: case Opt_ignore:
break; break;
case Opt_uid: case Opt_uid:
uid = make_kuid(current_user_ns(), result.uint_32); popt->uid = result.uid;
if (!uid_valid(uid))
return -EINVAL;
popt->uid = uid;
popt->uid_set = 1; popt->uid_set = 1;
break; break;
case Opt_gid: case Opt_gid:
gid = make_kgid(current_user_ns(), result.uint_32); popt->gid = result.gid;
if (!gid_valid(gid))
return -EINVAL;
popt->gid = gid;
popt->gid_set = 1; popt->gid_set = 1;
break; break;
case Opt_mode: case Opt_mode:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment