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>

diff --git a/fs/udf/super.c b/fs/udf/super.c
index 5bef3a68395d8d32f4f686370846e7b6909ca728..3c45117280b0db8ac6e1c89c3ca9feff0be08a59 100644 (file)
--- 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);