A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-14 00:24:41 -04:00
Code Issues Projects Releases Packages Wiki Activity

UPSTREAM: ANDROID: fuse-bpf: Fix perms on readdir

Browse source 
Add checks for both fuse accesses and backing fs accesses

Bug: 202785178
Test: fuse_test passes, also atest ScopedStorageDeviceTest passes
Change-Id: Ida7d90e14ca36588a8cc19453e0d40b4f6f41aa9
Signed-off-by: Paul Lawrence <paullawrence@google.com>
This commit is contained in:
Paul Lawrence 2022-01-07 20:36:53 +00:00 • committed by Alexander Martinz
commit f41257ce1b
No known key found for this signature in database
GPG key ID: CF15BDD9A321A9B2
2 changed files with 27 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

24
fs/fuse/backing.c
View file

@ -140,6 +140,8 @@ int fuse_open_backing(struct fuse_args *fa,
struct fuse_mount *fm = get_fuse_mount(inode);
const struct fuse_open_in *foi = fa->in_args[0].value;
struct fuse_file *ff;
int retval;
int mask;
struct fuse_dentry *fd = get_fuse_dentry(file->f_path.dentry);
struct file *backing_file;
@ -148,9 +150,31 @@ int fuse_open_backing(struct fuse_args *fa,
return -ENOMEM;
file->private_data = ff;
switch (foi->flags & O_ACCMODE) {
case O_RDONLY:
mask = MAY_READ;
break;
case O_WRONLY:
mask = MAY_WRITE;
break;
case O_RDWR:
mask = MAY_READ | MAY_WRITE;
break;
default:
return -EINVAL;
}
retval = inode_permission(get_fuse_inode(inode)->backing_inode, mask);
if (retval)
return retval;
backing_file = dentry_open(&fd->backing_path,
foi->flags,
current_cred());
if (IS_ERR(backing_file)) {
fuse_file_free(ff);
file->private_data = NULL;

4
fs/fuse/dir.c
View file

@ -1514,6 +1514,7 @@ static int fuse_permission(struct inode *inode, int mask)
struct fuse_conn *fc = get_fuse_conn(inode);
bool refreshed = false;
int err = 0;
struct fuse_inode *fi = get_fuse_inode(inode);
if (fuse_is_bad(inode))
return -EIO;
@ -1526,7 +1527,6 @@ static int fuse_permission(struct inode *inode, int mask)
*/
if (fc->default_permissions ||
((mask & MAY_EXEC) && S_ISREG(inode->i_mode))) {
struct fuse_inode *fi = get_fuse_inode(inode);
u32 perm_mask = STATX_MODE | STATX_UID | STATX_GID;
if (perm_mask & READ_ONCE(fi->inval_mask) ||
@ -1566,6 +1566,8 @@ static int fuse_permission(struct inode *inode, int mask)
if (!err && !(inode->i_mode & S_IXUGO))
return -EACCES;
}
} else if (!(mask & MAY_NOT_BLOCK) && fi->backing_inode) {
err = fuse_access(inode, mask);
}
return err;
}