isofs: handle large user and group ID

If uid or gid of mount options is larger than INT_MAX, isofs_fill_super
will return -EINVAL.

The problem can be encountered by a domain user or reproduced via:
mount -o loop,uid=2147483648 ubuntu-16.04.6-server-amd64.iso /mnt

This can be fixed as commit 233a01fa9c4c ("fuse: handle large user and
group ID").

Link: https://lore.kernel.org/r/20210129045315.10375-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/isofs/inode.c b/fs/isofs/inode.c
index ec90773527eeabe8fbca5b33822fab5639403970..21edc423b79fafa97bf868da7107bfa9df37995b 100644 (file)
--- a/fs/isofs/inode.c
+++ b/fs/isofs/inode.c
@@ -339,6 +339,7 @@ static int parse_options(char *options, struct iso9660_options *popt)
 {
        char *p;
        int option;
+       unsigned int uv;
 
        popt->map = 'n';
        popt->rock = 1;
@@ -434,17 +435,17 @@ static int parse_options(char *options, struct iso9660_options *popt)
                case Opt_ignore:
                        break;
                case Opt_uid:
-                       if (match_int(&args[0], &option))
+                       if (match_uint(&args[0], &uv))
                                return 0;
-                       popt->uid = make_kuid(current_user_ns(), option);
+                       popt->uid = make_kuid(current_user_ns(), uv);
                        if (!uid_valid(popt->uid))
                                return 0;
                        popt->uid_set = 1;
                        break;
                case Opt_gid:
-                       if (match_int(&args[0], &option))
+                       if (match_uint(&args[0], &uv))
                                return 0;
-                       popt->gid = make_kgid(current_user_ns(), option);
+                       popt->gid = make_kgid(current_user_ns(), uv);
                        if (!gid_valid(popt->gid))
                                return 0;
                        popt->gid_set = 1;