Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6;
From:   xiubli@redhat.com
To:     miklos@szeredi.hu
Cc:     linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
        Xiubo Li <xiubli@redhat.com>
Subject: [PATCH] fuse: pass ATTR_KILL_SUID/ATTR_KILL_SGID mode bits to user space
Date:   Thu, 21 Sep 2023 10:24:36 +0800
Message-ID: <20230921022436.1191166-1-xiubli@redhat.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

From: Xiubo Li <xiubli@redhat.com>

Such as for the xfstest-dev's generic/684 test case it will clear
suid and sgid if the fallocate request is commit by an unprivileged
user.

We need to pass the ATTR_KILL_SUID/ATTR_KILL_SGID flags to userspace.

Signed-off-by: Xiubo Li <xiubli@redhat.com>
---
 fs/fuse/dir.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index f67bef9d83c4..73dcf54efbff 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -1938,11 +1938,11 @@ static int fuse_setattr(struct mnt_idmap *idmap, struct dentry *entry,
 
 			attr->ia_mode = inode->i_mode;
 			if (inode->i_mode & S_ISUID) {
-				attr->ia_valid |= ATTR_MODE;
+				attr->ia_valid |= ATTR_KILL_SUID | ATTR_MODE;
 				attr->ia_mode &= ~S_ISUID;
 			}
 			if ((inode->i_mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP)) {
-				attr->ia_valid |= ATTR_MODE;
+				attr->ia_valid |= ATTR_KILL_SGID | ATTR_MODE;
 				attr->ia_mode &= ~S_ISGID;
 			}
 		}
-- 
2.41.0