diff options
author | BingJing Chang <bingjingc@synology.com> | 2021-01-29 05:55:02 +0100 |
---|---|---|
committer | Jan Kara <jack@suse.cz> | 2021-02-03 19:05:54 +0100 |
commit | 3a9a3aa805af842f7a20adbf7f1006caddb87d31 (patch) | |
tree | 06697bff9cc8dfed4be2fcf5c3f71ed0c57d4594 | |
parent | isofs: handle large user and group ID (diff) | |
download | linux-3a9a3aa805af842f7a20adbf7f1006caddb87d31.tar.xz linux-3a9a3aa805af842f7a20adbf7f1006caddb87d31.zip |
udf: handle large user and group ID
If uid or gid of mount options is larger than INT_MAX, udf_fill_super will
return -EINVAL.
The problem can be encountered by a domain user or reproduced via:
mount -o loop,uid=2147483648 something-in-udf-format.iso /mnt
This can be fixed as commit 233a01fa9c4c ("fuse: handle large user and
group ID").
Link: https://lore.kernel.org/r/20210129045502.10546-1-bingjingc@synology.com
Reviewed-by: Robbie Ko <robbieko@synology.com>
Reviewed-by: Chung-Chiang Cheng <cccheng@synology.com>
Signed-off-by: BingJing Chang <bingjingc@synology.com>
Signed-off-by: Jan Kara <jack@suse.cz>
-rw-r--r-- | fs/udf/super.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/udf/super.c b/fs/udf/super.c index 5bef3a68395d..3c45117280b0 100644 --- a/fs/udf/super.c +++ b/fs/udf/super.c @@ -459,6 +459,7 @@ static int udf_parse_options(char *options, struct udf_options *uopt, { char *p; int option; + unsigned int uv; uopt->novrs = 0; uopt->session = 0xFFFFFFFF; @@ -508,17 +509,17 @@ static int udf_parse_options(char *options, struct udf_options *uopt, uopt->flags &= ~(1 << UDF_FLAG_USE_SHORT_AD); break; case Opt_gid: - if (match_int(args, &option)) + if (match_uint(args, &uv)) return 0; - uopt->gid = make_kgid(current_user_ns(), option); + uopt->gid = make_kgid(current_user_ns(), uv); if (!gid_valid(uopt->gid)) return 0; uopt->flags |= (1 << UDF_FLAG_GID_SET); break; case Opt_uid: - if (match_int(args, &option)) + if (match_uint(args, &uv)) return 0; - uopt->uid = make_kuid(current_user_ns(), option); + uopt->uid = make_kuid(current_user_ns(), uv); if (!uid_valid(uopt->uid)) return 0; uopt->flags |= (1 << UDF_FLAG_UID_SET); |