The patch titled
fuse: validate rootmode mount option
has been removed from the -mm tree. Its filename was
fuse-validate-rootmode-mount-option.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: fuse: validate rootmode mount option
From: Timo Savola <tsavola@xxxxxxxxx>
If rootmode isn't valid, we hit the BUG() in fuse_init_inode. Now
EINVAL is returned.
Signed-off-by: Timo Savola <tsavola@xxxxxxxxx>
Signed-off-by: Miklos Szeredi <mszeredi@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/fuse/dir.c | 5 +++--
fs/fuse/fuse_i.h | 5 +++++
fs/fuse/inode.c | 2 ++
3 files changed, 10 insertions(+), 2 deletions(-)
diff -puN fs/fuse/dir.c~fuse-validate-rootmode-mount-option fs/fuse/dir.c
--- a/fs/fuse/dir.c~fuse-validate-rootmode-mount-option
+++ a/fs/fuse/dir.c
@@ -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(struct
fuse_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,
diff -puN fs/fuse/fuse_i.h~fuse-validate-rootmode-mount-option fs/fuse/fuse_i.h
--- a/fs/fuse/fuse_i.h~fuse-validate-rootmode-mount-option
+++ a/fs/fuse/fuse_i.h
@@ -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);
diff -puN fs/fuse/inode.c~fuse-validate-rootmode-mount-option fs/fuse/inode.c
--- a/fs/fuse/inode.c~fuse-validate-rootmode-mount-option
+++ a/fs/fuse/inode.c
@@ -330,6 +330,8 @@ static int parse_fuse_opt(char *opt, str
case 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;
_
Patches currently in -mm which might be from tsavola@xxxxxxxxx are
origin.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
