Skip to content

Commit

Permalink
fuse: fix bad inode
Browse files Browse the repository at this point in the history
commit 5d069db upstream.

Jan Kara's analysis of the syzbot report (edited):

  The reproducer opens a directory on FUSE filesystem, it then attaches
  dnotify mark to the open directory.  After that a fuse_do_getattr() call
  finds that attributes returned by the server are inconsistent, and calls
  make_bad_inode() which, among other things does:

          inode->i_mode = S_IFREG;

  This then confuses dnotify which doesn't tear down its structures
  properly and eventually crashes.

Avoid calling make_bad_inode() on a live inode: switch to a private flag on
the fuse inode.  Also add the test to ops which the bad_inode_ops would
have caught.

This bug goes back to the initial merge of fuse in 2.6.14...

Reported-by: syzbot+f427adf9324b92652ccc@syzkaller.appspotmail.com
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Tested-by: Jan Kara <jack@suse.cz>
Cc: <stable@vger.kernel.org>
[bwh: Backported to 4.19:
 - Drop changes in fuse_dir_fsync(), fuse_readahead(), fuse_evict_inode()
 - In fuse_get_link(), return ERR_PTR(-EIO) for bad inodes
 - Convert some additional calls to is_bad_inode()
 - Adjust filename, context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Miklos Szeredi authored and Greg Kroah-Hartman committed Jan 27, 2022
1 parent 294c7a9 commit 1e1bb49
Show file tree
Hide file tree
Showing 6 changed files with 81 additions and 15 deletions.
6 changes: 6 additions & 0 deletions fs/fuse/acl.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ struct posix_acl *fuse_get_acl(struct inode *inode, int type)
void *value = NULL;
struct posix_acl *acl;

if (fuse_is_bad(inode))
return ERR_PTR(-EIO);

if (!fc->posix_acl || fc->no_getxattr)
return NULL;

Expand Down Expand Up @@ -53,6 +56,9 @@ int fuse_set_acl(struct inode *inode, struct posix_acl *acl, int type)
const char *name;
int ret;

if (fuse_is_bad(inode))
return -EIO;

if (!fc->posix_acl || fc->no_setxattr)
return -EOPNOTSUPP;

Expand Down
40 changes: 35 additions & 5 deletions fs/fuse/dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ static int fuse_dentry_revalidate(struct dentry *entry, unsigned int flags)
int ret;

inode = d_inode_rcu(entry);
if (inode && is_bad_inode(inode))
if (inode && fuse_is_bad(inode))
goto invalid;
else if (time_before64(fuse_dentry_time(entry), get_jiffies_64()) ||
(flags & LOOKUP_REVAL)) {
Expand Down Expand Up @@ -364,6 +364,9 @@ static struct dentry *fuse_lookup(struct inode *dir, struct dentry *entry,
bool outarg_valid = true;
bool locked;

if (fuse_is_bad(dir))
return ERR_PTR(-EIO);

locked = fuse_lock_inode(dir);
err = fuse_lookup_name(dir->i_sb, get_node_id(dir), &entry->d_name,
&outarg, &inode);
Expand Down Expand Up @@ -504,6 +507,9 @@ static int fuse_atomic_open(struct inode *dir, struct dentry *entry,
struct fuse_conn *fc = get_fuse_conn(dir);
struct dentry *res = NULL;

if (fuse_is_bad(dir))
return -EIO;

if (d_in_lookup(entry)) {
res = fuse_lookup(dir, entry, 0);
if (IS_ERR(res))
Expand Down Expand Up @@ -552,6 +558,9 @@ static int create_new_entry(struct fuse_conn *fc, struct fuse_args *args,
int err;
struct fuse_forget_link *forget;

if (fuse_is_bad(dir))
return -EIO;

forget = fuse_alloc_forget();
if (!forget)
return -ENOMEM;
Expand Down Expand Up @@ -679,6 +688,9 @@ static int fuse_unlink(struct inode *dir, struct dentry *entry)
struct fuse_conn *fc = get_fuse_conn(dir);
FUSE_ARGS(args);

if (fuse_is_bad(dir))
return -EIO;

args.in.h.opcode = FUSE_UNLINK;
args.in.h.nodeid = get_node_id(dir);
args.in.numargs = 1;
Expand Down Expand Up @@ -715,6 +727,9 @@ static int fuse_rmdir(struct inode *dir, struct dentry *entry)
struct fuse_conn *fc = get_fuse_conn(dir);
FUSE_ARGS(args);

if (fuse_is_bad(dir))
return -EIO;

args.in.h.opcode = FUSE_RMDIR;
args.in.h.nodeid = get_node_id(dir);
args.in.numargs = 1;
Expand Down Expand Up @@ -793,6 +808,9 @@ static int fuse_rename2(struct inode *olddir, struct dentry *oldent,
struct fuse_conn *fc = get_fuse_conn(olddir);
int err;

if (fuse_is_bad(olddir))
return -EIO;

if (flags & ~(RENAME_NOREPLACE | RENAME_EXCHANGE))
return -EINVAL;

Expand Down Expand Up @@ -928,7 +946,7 @@ static int fuse_do_getattr(struct inode *inode, struct kstat *stat,
if (!err) {
if (fuse_invalid_attr(&outarg.attr) ||
(inode->i_mode ^ outarg.attr.mode) & S_IFMT) {
make_bad_inode(inode);
fuse_make_bad(inode);
err = -EIO;
} else {
fuse_change_attributes(inode, &outarg.attr,
Expand Down Expand Up @@ -1125,6 +1143,9 @@ static int fuse_permission(struct inode *inode, int mask)
bool refreshed = false;
int err = 0;

if (fuse_is_bad(inode))
return -EIO;

if (!fuse_allow_current_process(fc))
return -EACCES;

Expand Down Expand Up @@ -1262,7 +1283,7 @@ static int fuse_direntplus_link(struct file *file,
dput(dentry);
goto retry;
}
if (is_bad_inode(inode)) {
if (fuse_is_bad(inode)) {
dput(dentry);
return -EIO;
}
Expand Down Expand Up @@ -1360,7 +1381,7 @@ static int fuse_readdir(struct file *file, struct dir_context *ctx)
u64 attr_version = 0;
bool locked;

if (is_bad_inode(inode))
if (fuse_is_bad(inode))
return -EIO;

req = fuse_get_req(fc, 1);
Expand Down Expand Up @@ -1420,6 +1441,9 @@ static const char *fuse_get_link(struct dentry *dentry,
if (!dentry)
return ERR_PTR(-ECHILD);

if (fuse_is_bad(inode))
return ERR_PTR(-EIO);

link = kmalloc(PAGE_SIZE, GFP_KERNEL);
if (!link)
return ERR_PTR(-ENOMEM);
Expand Down Expand Up @@ -1718,7 +1742,7 @@ int fuse_do_setattr(struct dentry *dentry, struct iattr *attr,

if (fuse_invalid_attr(&outarg.attr) ||
(inode->i_mode ^ outarg.attr.mode) & S_IFMT) {
make_bad_inode(inode);
fuse_make_bad(inode);
err = -EIO;
goto error;
}
Expand Down Expand Up @@ -1774,6 +1798,9 @@ static int fuse_setattr(struct dentry *entry, struct iattr *attr)
struct file *file = (attr->ia_valid & ATTR_FILE) ? attr->ia_file : NULL;
int ret;

if (fuse_is_bad(inode))
return -EIO;

if (!fuse_allow_current_process(get_fuse_conn(inode)))
return -EACCES;

Expand Down Expand Up @@ -1832,6 +1859,9 @@ static int fuse_getattr(const struct path *path, struct kstat *stat,
struct inode *inode = d_inode(path->dentry);
struct fuse_conn *fc = get_fuse_conn(inode);

if (fuse_is_bad(inode))
return -EIO;

if (!fuse_allow_current_process(fc))
return -EACCES;

Expand Down
27 changes: 18 additions & 9 deletions fs/fuse/file.c
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,9 @@ int fuse_open_common(struct inode *inode, struct file *file, bool isdir)
fc->atomic_o_trunc &&
fc->writeback_cache;

if (fuse_is_bad(inode))
return -EIO;

err = generic_file_open(inode, file);
if (err)
return err;
Expand Down Expand Up @@ -411,7 +414,7 @@ static int fuse_flush(struct file *file, fl_owner_t id)
struct fuse_flush_in inarg;
int err;

if (is_bad_inode(inode))
if (fuse_is_bad(inode))
return -EIO;

if (fc->no_flush)
Expand Down Expand Up @@ -459,7 +462,7 @@ int fuse_fsync_common(struct file *file, loff_t start, loff_t end,
struct fuse_fsync_in inarg;
int err;

if (is_bad_inode(inode))
if (fuse_is_bad(inode))
return -EIO;

inode_lock(inode);
Expand Down Expand Up @@ -774,7 +777,7 @@ static int fuse_readpage(struct file *file, struct page *page)
int err;

err = -EIO;
if (is_bad_inode(inode))
if (fuse_is_bad(inode))
goto out;

err = fuse_do_readpage(file, page);
Expand Down Expand Up @@ -901,7 +904,7 @@ static int fuse_readpages(struct file *file, struct address_space *mapping,
int nr_alloc = min_t(unsigned, nr_pages, FUSE_MAX_PAGES_PER_REQ);

err = -EIO;
if (is_bad_inode(inode))
if (fuse_is_bad(inode))
goto out;

data.file = file;
Expand Down Expand Up @@ -931,6 +934,9 @@ static ssize_t fuse_file_read_iter(struct kiocb *iocb, struct iov_iter *to)
struct inode *inode = iocb->ki_filp->f_mapping->host;
struct fuse_conn *fc = get_fuse_conn(inode);

if (fuse_is_bad(inode))
return -EIO;

/*
* In auto invalidate mode, always update attributes on read.
* Otherwise, only update if we attempt to read past EOF (to ensure
Expand Down Expand Up @@ -1131,7 +1137,7 @@ static ssize_t fuse_perform_write(struct kiocb *iocb,
int err = 0;
ssize_t res = 0;

if (is_bad_inode(inode))
if (fuse_is_bad(inode))
return -EIO;

if (inode->i_size < pos + iov_iter_count(ii))
Expand Down Expand Up @@ -1188,6 +1194,9 @@ static ssize_t fuse_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
ssize_t err;
loff_t endbyte = 0;

if (fuse_is_bad(inode))
return -EIO;

if (get_fuse_conn(inode)->writeback_cache) {
/* Update size (EOF optimization) and mode (SUID clearing) */
err = fuse_update_attributes(mapping->host, file);
Expand Down Expand Up @@ -1424,7 +1433,7 @@ static ssize_t __fuse_direct_read(struct fuse_io_priv *io,
ssize_t res;
struct inode *inode = file_inode(io->iocb->ki_filp);

if (is_bad_inode(inode))
if (fuse_is_bad(inode))
return -EIO;

res = fuse_direct_io(io, iter, ppos, 0);
Expand All @@ -1446,7 +1455,7 @@ static ssize_t fuse_direct_write_iter(struct kiocb *iocb, struct iov_iter *from)
struct fuse_io_priv io = FUSE_IO_PRIV_SYNC(iocb);
ssize_t res;

if (is_bad_inode(inode))
if (fuse_is_bad(inode))
return -EIO;

/* Don't allow parallel writes to the same file */
Expand Down Expand Up @@ -1920,7 +1929,7 @@ static int fuse_writepages(struct address_space *mapping,
int err;

err = -EIO;
if (is_bad_inode(inode))
if (fuse_is_bad(inode))
goto out;

data.inode = inode;
Expand Down Expand Up @@ -2705,7 +2714,7 @@ long fuse_ioctl_common(struct file *file, unsigned int cmd,
if (!fuse_allow_current_process(fc))
return -EACCES;

if (is_bad_inode(inode))
if (fuse_is_bad(inode))
return -EIO;

return fuse_do_ioctl(file, cmd, arg, flags);
Expand Down
12 changes: 12 additions & 0 deletions fs/fuse/fuse_i.h
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,8 @@ enum {
FUSE_I_INIT_RDPLUS,
/** An operation changing file size is in progress */
FUSE_I_SIZE_UNSTABLE,
/* Bad inode */
FUSE_I_BAD,
};

struct fuse_conn;
Expand Down Expand Up @@ -700,6 +702,16 @@ static inline u64 get_node_id(struct inode *inode)
return get_fuse_inode(inode)->nodeid;
}

static inline void fuse_make_bad(struct inode *inode)
{
set_bit(FUSE_I_BAD, &get_fuse_inode(inode)->state);
}

static inline bool fuse_is_bad(struct inode *inode)
{
return unlikely(test_bit(FUSE_I_BAD, &get_fuse_inode(inode)->state));
}

/** Device operations */
extern const struct file_operations fuse_dev_operations;

Expand Down
2 changes: 1 addition & 1 deletion fs/fuse/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ struct inode *fuse_iget(struct super_block *sb, u64 nodeid,
unlock_new_inode(inode);
} else if ((inode->i_mode ^ attr->mode) & S_IFMT) {
/* Inode has changed type, any I/O on the old should fail */
make_bad_inode(inode);
fuse_make_bad(inode);
iput(inode);
goto retry;
}
Expand Down
9 changes: 9 additions & 0 deletions fs/fuse/xattr.c
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,9 @@ ssize_t fuse_listxattr(struct dentry *entry, char *list, size_t size)
struct fuse_getxattr_out outarg;
ssize_t ret;

if (fuse_is_bad(inode))
return -EIO;

if (!fuse_allow_current_process(fc))
return -EACCES;

Expand Down Expand Up @@ -178,6 +181,9 @@ static int fuse_xattr_get(const struct xattr_handler *handler,
struct dentry *dentry, struct inode *inode,
const char *name, void *value, size_t size)
{
if (fuse_is_bad(inode))
return -EIO;

return fuse_getxattr(inode, name, value, size);
}

Expand All @@ -186,6 +192,9 @@ static int fuse_xattr_set(const struct xattr_handler *handler,
const char *name, const void *value, size_t size,
int flags)
{
if (fuse_is_bad(inode))
return -EIO;

if (!value)
return fuse_removexattr(inode, name);

Expand Down

0 comments on commit 1e1bb49

Please sign in to comment.