From: Miklos Szeredi <mszeredi@redhat.com>
Date: Mon, 3 Dec 2018 09:14:43 +0000 (+0100)
Subject: fuse: fix revalidation of attributes for permission check
X-Git-Tag: v4.20-rc7~18^2~2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=d233c7dd1682437ba4b430b04766aa6eef9aef67;p=linux-2.6-block.git

fuse: fix revalidation of attributes for permission check

fuse_invalidate_attr() now sets fi->inval_mask instead of fi->i_time, hence
we need to check the inval mask in fuse_permission() as well.

Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Fixes: 2f1e81965fd0 ("fuse: allow fine grained attr cache invaldation")
---

diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index 56931dfdcc46..dc4e83d8ace7 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -1119,8 +1119,10 @@ 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 (time_before64(fi->i_time, get_jiffies_64())) {
+		if (perm_mask & READ_ONCE(fi->inval_mask) ||
+		    time_before64(fi->i_time, get_jiffies_64())) {
 			refreshed = true;
 
 			err = fuse_perm_getattr(inode, mask);