Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33b52836 authored by Jan Kara's avatar Jan Kara Committed by Sasha Levin
Browse files

fuse: Propagate dentry down to inode_change_ok() 



[ Upstream commit 62490330769c1ce5dcba3f1f3e8f4005e9b797e6 ]

To avoid clearing of capabilities or security related extended
attributes too early, inode_change_ok() will need to take dentry instead
of inode. Propagate it down to fuse_do_setattr().

Acked-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
parent fa9b0c17

fs/fuse/dir.c

+4 −3
Original line number Diff line number Diff line
@@ -1693,9 +1693,10 @@ int fuse_flush_times(struct inode *inode, struct fuse_file *ff) 
 * vmtruncate() doesn't allow for this case, so do the rlimit checking

 * and the actual truncation by hand.

 */

int fuse_do_setattr(struct inode *inode, struct iattr *attr,

int fuse_do_setattr(struct dentry *dentry, struct iattr *attr,

		    struct file *file)

{

	struct inode *inode = d_inode(dentry);

	struct fuse_conn *fc = get_fuse_conn(inode);

	struct fuse_inode *fi = get_fuse_inode(inode);

	struct fuse_req *req;
@@ -1815,9 +1816,9 @@ static int fuse_setattr(struct dentry *entry, struct iattr *attr) 
		return -EACCES;



	if (attr->ia_valid & ATTR_FILE)

		return fuse_do_setattr(inode, attr, attr->ia_file);

		return fuse_do_setattr(entry, attr, attr->ia_file);

	else

		return fuse_do_setattr(inode, attr, NULL);

		return fuse_do_setattr(entry, attr, NULL);

}



static int fuse_getattr(struct vfsmount *mnt, struct dentry *entry,

fs/fuse/file.c

+1 −1
Original line number Diff line number Diff line
@@ -2879,7 +2879,7 @@ static void fuse_do_truncate(struct file *file) 
	attr.ia_file = file;

	attr.ia_valid |= ATTR_FILE;



	fuse_do_setattr(inode, &attr, file);

	fuse_do_setattr(file->f_path.dentry, &attr, file);

}



static inline loff_t fuse_round_up(loff_t off)

fs/fuse/fuse_i.h

+1 −1
Original line number Diff line number Diff line
@@ -894,7 +894,7 @@ bool fuse_write_update_size(struct inode *inode, loff_t pos); 
int fuse_flush_times(struct inode *inode, struct fuse_file *ff);

int fuse_write_inode(struct inode *inode, struct writeback_control *wbc);



int fuse_do_setattr(struct inode *inode, struct iattr *attr,

int fuse_do_setattr(struct dentry *dentry, struct iattr *attr,

		    struct file *file);



#endif /* _FS_FUSE_I_H */