FUSE: Validate rootmode mount option
PATCH 1/1 FUSE: Validate rootmode mount option
If rootmode doesn't include any file type bits, we hit the BUG() in fuse_init_inode. Now EINVAL is returned.
Signed-off-by Timo Savola <[email protected]>
--- fs/fuse/inode.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
fs/fuse/inode.c +2 -0
@@ -330,6 +330,8 @@ static int parse_fuse_opt(char *opt, struct fuse_mount_data *d, int is_bdev)case OPT_ROOTMODE :if (match_octal (&args[0 ], &value))return 0 ; +if ((value &S_IFMT ) ==0 ) +return 0 ; d->rootmode = value; d->rootmode_present =1 ;break ;
Signature · 1 line
1.4.4.4
Miklos Szeredi
maintainerQuoted 2 lines
If rootmode doesn't include any file type bits, we hit the
BUG()infuse_init_inode. Now EINVAL is returned.
Thanks, well spotted.
I'll queue this more complete fix.
Miklos
----
From: Timo Savola <[email protected]>
Subject: fuse: validate rootmode mount option
If rootmode isn't valid, we hit the BUG() in fuse_init_inode. Now EINVAL is returned.
Signed-off-by Timo Savola <[email protected]>
Signed-off-by Miklos Szeredi <[email protected]>
---
fs/fuse/inode.c +2 -0
@@ -330,6 +330,8 @@ static int parse_fuse_opt(char *opt, strcase OPT_ROOTMODE :if (match_octal (&args[0 ], &value))return 0 ; +if (!fuse_valid_type (value)) +return 0 ; d->rootmode = value; d->rootmode_present =1 ;break ;
fs/fuse/dir.c +3 -2
@@ -195,7 +195,7 @@ static struct dentry_operations fuse_den .d_revalidate = fuse_dentry_revalidate, }; -static int valid_mode (int m) +int fuse_valid_type (int m) {return S_ISREG (m) ||S_ISDIR (m) ||S_ISLNK (m) ||S_ISCHR (m) ||S_ISBLK (m) ||S_ISFIFO (m) ||S_ISSOCK (m);
@@ -248,7 +248,8 @@ static struct dentry *fuse_lookup(structfuse_put_request (fc, req);/* Zero nodeid is same as -ENOENT, but with valid timeout */ if (!err && outarg.nodeid && - (invalid_nodeid (outarg.nodeid) || !valid_mode (outarg.attr.mode))) + (invalid_nodeid (outarg.nodeid) || + !fuse_valid_type (outarg.attr.mode))) err = -EIO ;if (!err && outarg.nodeid) { inode = fuse_iget(dir->i_sb, outarg.nodeid, outarg.generation,
fs/fuse/fuse_i.h +5 -0
@@ -552,3 +552,8 @@ int fuse_ctl_add_conn(struct fuse_conn ** Remove connection from control filesystem */ void fuse_ctl_remove_conn (struct fuse_conn *fc); + +/** +* Is file type valid? +*/ +int fuse_valid_type (int m);