fuse: fix permission checking on sticky directories
The VFS checks sticky bits on the parent directory even if the filesystem defines it's own ->permission(). In some situations (sshfs, mountlo, etc) the user does have permission to delete a file even if the attribute based checking would not allow it. So work around this by storing the permission bits separately and returning them in stat(), but cutting the permission bits off from inode->i_mode. This is slightly hackish, but it's probably not worth it to add new infrastructure in VFS and a slight performance penalty for all filesystems, just for the sake of fuse. [Jan Engelhardt] cosmetic fixes Signed-off-by: Miklos Szeredi <mszeredi@suse.cz> Cc: Jan Engelhardt <jengelh@linux01.gwdg.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:

committed by
Linus Torvalds

parent
244f6385c2
commit
ebc14c4dbe
@@ -120,10 +120,11 @@ static void fuse_truncate(struct address_space *mapping, loff_t offset)
|
||||
void fuse_change_attributes(struct inode *inode, struct fuse_attr *attr)
|
||||
{
|
||||
struct fuse_conn *fc = get_fuse_conn(inode);
|
||||
struct fuse_inode *fi = get_fuse_inode(inode);
|
||||
loff_t oldsize;
|
||||
|
||||
inode->i_ino = attr->ino;
|
||||
inode->i_mode = (inode->i_mode & S_IFMT) + (attr->mode & 07777);
|
||||
inode->i_mode = (inode->i_mode & S_IFMT) | (attr->mode & 07777);
|
||||
inode->i_nlink = attr->nlink;
|
||||
inode->i_uid = attr->uid;
|
||||
inode->i_gid = attr->gid;
|
||||
@@ -135,6 +136,15 @@ void fuse_change_attributes(struct inode *inode, struct fuse_attr *attr)
|
||||
inode->i_ctime.tv_sec = attr->ctime;
|
||||
inode->i_ctime.tv_nsec = attr->ctimensec;
|
||||
|
||||
/*
|
||||
* Don't set the sticky bit in i_mode, unless we want the VFS
|
||||
* to check permissions. This prevents failures due to the
|
||||
* check in may_delete().
|
||||
*/
|
||||
fi->orig_i_mode = inode->i_mode;
|
||||
if (!(fc->flags & FUSE_DEFAULT_PERMISSIONS))
|
||||
inode->i_mode &= ~S_ISVTX;
|
||||
|
||||
spin_lock(&fc->lock);
|
||||
oldsize = inode->i_size;
|
||||
i_size_write(inode, attr->size);
|
||||
|
Reference in New Issue
Block a user