isofs: handle large user and group ID

[sfrench/cifs-2.6.git] / fs / isofs / inode.c

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;
 {
        char *p;
        int option;

+       unsigned int uv;

 
        popt->map = 'n';
        popt->rock = 1;
 
        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:
                case Opt_ignore:
                        break;
                case Opt_uid:

-                       if (match_int(&args[0], &option))
+                       if (match_uint(&args[0], &uv))

                                return 0;
                                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 (!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;
                                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;
                        if (!gid_valid(popt->gid))
                                return 0;
                        popt->gid_set = 1;