Skip to content

Commit

Permalink
new helper: inode_wrong_type()
Browse files Browse the repository at this point in the history 
commit 6e3e2c4 upstream.

inode_wrong_type(inode, mode) returns true if setting inode->i_mode
to given value would've changed the inode type.  We have enough of
those checks open-coded to make a helper worthwhile.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
@gregkh
Al Viro authored and gregkh committed Sep 8, 2021
1 parent ded9137 commit 40ba433
Show file tree
Hide file tree
Showing 10 changed files with 22 additions and 18 deletions.
4 changes: 2 additions & 2 deletions fs/9p/vfs_inode.c
View file
Expand Up @@ -398,7 +398,7 @@ static int v9fs_test_inode(struct inode *inode, void *data)

umode = p9mode2unixmode(v9ses, st, &rdev);
/* don't match inode of different type */
if ((inode->i_mode & S_IFMT) != (umode & S_IFMT))
if (inode_wrong_type(inode, umode))
return 0;

/* compare qid details */
Expand Down Expand Up @@ -1360,7 +1360,7 @@ int v9fs_refresh_inode(struct p9_fid *fid, struct inode *inode)
* Don't update inode if the file type is different
*/
umode = p9mode2unixmode(v9ses, st, &rdev);
if ((inode->i_mode & S_IFMT) != (umode & S_IFMT))
if (inode_wrong_type(inode, umode))
goto out;

/*
Expand Down
4 changes: 2 additions & 2 deletions fs/9p/vfs_inode_dotl.c
View file
Expand Up @@ -59,7 +59,7 @@ static int v9fs_test_inode_dotl(struct inode *inode, void *data)
struct p9_stat_dotl *st = (struct p9_stat_dotl *)data;

/* don't match inode of different type */
if ((inode->i_mode & S_IFMT) != (st->st_mode & S_IFMT))
if (inode_wrong_type(inode, st->st_mode))
return 0;

if (inode->i_generation != st->st_gen)
Expand Down Expand Up @@ -933,7 +933,7 @@ int v9fs_refresh_inode_dotl(struct p9_fid *fid, struct inode *inode)
/*
* Don't update inode if the file type is different
*/
if ((inode->i_mode & S_IFMT) != (st->st_mode & S_IFMT))
if (inode_wrong_type(inode, st->st_mode))
goto out;

/*
Expand Down
5 changes: 2 additions & 3 deletions fs/cifs/inode.c
View file
Expand Up @@ -425,8 +425,7 @@ int cifs_get_inode_info_unix(struct inode **pinode,
}

/* if filetype is different, return error */
if (unlikely(((*pinode)->i_mode & S_IFMT) !=
(fattr.cf_mode & S_IFMT))) {
if (unlikely(inode_wrong_type(*pinode, fattr.cf_mode))) {
CIFS_I(*pinode)->time = 0; /* force reval */
rc = -ESTALE;
goto cgiiu_exit;
Expand Down Expand Up @@ -1243,7 +1242,7 @@ cifs_find_inode(struct inode *inode, void *opaque)
return 0;

/* don't match inode of different type */
if ((inode->i_mode & S_IFMT) != (fattr->cf_mode & S_IFMT))
if (inode_wrong_type(inode, fattr->cf_mode))
return 0;

/* if it's not a directory or has no dentries, then flag it */
Expand Down
6 changes: 3 additions & 3 deletions fs/fuse/dir.c
View file
Expand Up @@ -252,7 +252,7 @@ static int fuse_dentry_revalidate(struct dentry *entry, unsigned int flags)
if (ret == -ENOMEM)
goto out;
if (ret || fuse_invalid_attr(&outarg.attr) ||
(outarg.attr.mode ^ inode->i_mode) & S_IFMT)
inode_wrong_type(inode, outarg.attr.mode))
goto invalid;

forget_all_cached_acls(inode);
Expand Down Expand Up @@ -1062,7 +1062,7 @@ static int fuse_do_getattr(struct inode *inode, struct kstat *stat,
err = fuse_simple_request(fm, &args);
if (!err) {
if (fuse_invalid_attr(&outarg.attr) ||
(inode->i_mode ^ outarg.attr.mode) & S_IFMT) {
inode_wrong_type(inode, outarg.attr.mode)) {
fuse_make_bad(inode);
err = -EIO;
} else {
Expand Down Expand Up @@ -1699,7 +1699,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) {
inode_wrong_type(inode, outarg.attr.mode)) {
fuse_make_bad(inode);
err = -EIO;
goto error;
Expand Down
2 changes: 1 addition & 1 deletion fs/fuse/inode.c
View file
Expand Up @@ -340,7 +340,7 @@ struct inode *fuse_iget(struct super_block *sb, u64 nodeid,
inode->i_generation = generation;
fuse_init_inode(inode, attr);
unlock_new_inode(inode);
} else if ((inode->i_mode ^ attr->mode) & S_IFMT) {
} else if (inode_wrong_type(inode, attr->mode)) {
/* Inode has changed type, any I/O on the old should fail */
fuse_make_bad(inode);
iput(inode);
Expand Down
2 changes: 1 addition & 1 deletion fs/fuse/readdir.c
View file
Expand Up @@ -202,7 +202,7 @@ static int fuse_direntplus_link(struct file *file,
inode = d_inode(dentry);
if (!inode ||
get_node_id(inode) != o->nodeid ||
((o->attr.mode ^ inode->i_mode) & S_IFMT)) {
inode_wrong_type(inode, o->attr.mode)) {
d_invalidate(dentry);
dput(dentry);
goto retry;
Expand Down
6 changes: 3 additions & 3 deletions fs/nfs/inode.c
View file
Expand Up @@ -322,7 +322,7 @@ nfs_find_actor(struct inode *inode, void *opaque)

if (NFS_FILEID(inode) != fattr->fileid)
return 0;
if ((S_IFMT & inode->i_mode) != (S_IFMT & fattr->mode))
if (inode_wrong_type(inode, fattr->mode))
return 0;
if (nfs_compare_fh(NFS_FH(inode), fh))
return 0;
Expand Down Expand Up @@ -1446,7 +1446,7 @@ static int nfs_check_inode_attributes(struct inode *inode, struct nfs_fattr *fat
return 0;
return -ESTALE;
}
if ((fattr->valid & NFS_ATTR_FATTR_TYPE) && (inode->i_mode & S_IFMT) != (fattr->mode & S_IFMT))
if ((fattr->valid & NFS_ATTR_FATTR_TYPE) && inode_wrong_type(inode, fattr->mode))
return -ESTALE;


Expand Down Expand Up @@ -1861,7 +1861,7 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)
/*
* Make sure the inode's type hasn't changed.
*/
if ((fattr->valid & NFS_ATTR_FATTR_TYPE) && (inode->i_mode & S_IFMT) != (fattr->mode & S_IFMT)) {
if ((fattr->valid & NFS_ATTR_FATTR_TYPE) && inode_wrong_type(inode, fattr->mode)) {
/*
* Big trouble! The inode has become a different object.
*/
Expand Down
2 changes: 1 addition & 1 deletion fs/nfsd/nfsproc.c
View file
Expand Up @@ -376,7 +376,7 @@ nfsd_proc_create(struct svc_rqst *rqstp)

/* Make sure the type and device matches */
resp->status = nfserr_exist;
if (inode && type != (inode->i_mode & S_IFMT))
if (inode && inode_wrong_type(inode, type))
goto out_unlock;
}

Expand Down
4 changes: 2 additions & 2 deletions fs/overlayfs/namei.c
View file
Expand Up @@ -366,7 +366,7 @@ int ovl_check_origin_fh(struct ovl_fs *ofs, struct ovl_fh *fh, bool connected,
return PTR_ERR(origin);

if (upperdentry && !ovl_is_whiteout(upperdentry) &&
((d_inode(origin)->i_mode ^ d_inode(upperdentry)->i_mode) & S_IFMT))
inode_wrong_type(d_inode(upperdentry), d_inode(origin)->i_mode))
goto invalid;

if (!*stackp)
Expand Down Expand Up @@ -724,7 +724,7 @@ struct dentry *ovl_lookup_index(struct ovl_fs *ofs, struct dentry *upper,
index = ERR_PTR(-ESTALE);
goto out;
} else if (ovl_dentry_weird(index) || ovl_is_whiteout(index) ||
((inode->i_mode ^ d_inode(origin)->i_mode) & S_IFMT)) {
inode_wrong_type(inode, d_inode(origin)->i_mode)) {
/*
* Index should always be of the same file type as origin
* except for the case of a whiteout index. A whiteout
Expand Down
5 changes: 5 additions & 0 deletions include/linux/fs.h
View file
Expand Up @@ -2768,6 +2768,11 @@ static inline bool execute_ok(struct inode *inode)
return (inode->i_mode & S_IXUGO) || S_ISDIR(inode->i_mode);
}

static inline bool inode_wrong_type(const struct inode *inode, umode_t mode)
{
return (inode->i_mode ^ mode) & S_IFMT;
}

static inline void file_start_write(struct file *file)
{
if (!S_ISREG(file_inode(file)->i_mode))
Expand Down

0 comments on commit 40ba433

Please sign in to comment.