diff options
| author | Miklos Szeredi <mszeredi@suse.cz> | 2014-07-07 15:28:51 +0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2014-08-06 18:07:36 +0100 |
| commit | 58b546648b5a5618db31ffaec70eb80b53a87d5b (patch) | |
| tree | 179854c906a9abec181a7b239622a84927f61da2 /fs | |
| parent | 38f8813cf29676b719ad3f15ae9489ce95b98ea9 (diff) | |
fuse: handle large user and group ID
commit 233a01fa9c4c7c41238537e8db8434667ff28a2f upstream.
If the number in "user_id=N" or "group_id=N" mount options was larger than
INT_MAX then fuse returned EINVAL.
Fix this to handle all valid uid/gid values.
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
[bwh: Backported to 3.2: no user namespace conversion]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/fuse/inode.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index 912c250b314a..afc0f7066d94 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c @@ -437,6 +437,17 @@ static const match_table_t tokens = { {OPT_ERR, NULL} }; +static int fuse_match_uint(substring_t *s, unsigned int *res) +{ + int err = -ENOMEM; + char *buf = match_strdup(s); + if (buf) { + err = kstrtouint(buf, 10, res); + kfree(buf); + } + return err; +} + static int parse_fuse_opt(char *opt, struct fuse_mount_data *d, int is_bdev) { char *p; @@ -447,6 +458,7 @@ static int parse_fuse_opt(char *opt, struct fuse_mount_data *d, int is_bdev) while ((p = strsep(&opt, ",")) != NULL) { int token; int value; + unsigned uv; substring_t args[MAX_OPT_ARGS]; if (!*p) continue; @@ -470,16 +482,16 @@ static int parse_fuse_opt(char *opt, struct fuse_mount_data *d, int is_bdev) break; case OPT_USER_ID: - if (match_int(&args[0], &value)) + if (fuse_match_uint(&args[0], &uv)) return 0; - d->user_id = value; + d->user_id = uv; d->user_id_present = 1; break; case OPT_GROUP_ID: - if (match_int(&args[0], &value)) + if (fuse_match_uint(&args[0], &uv)) return 0; - d->group_id = value; + d->group_id = uv; d->group_id_present = 1; break; |