author: Christian Brauner <brauner@kernel.org> 2023-05-02 15:36:02 +0200
committer: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 2023-07-19 16:36:54 +0200
commit: 7fd2ca4a860c169c812b19fa93a973bba1542c52
parent: ebe07db840992a3886694ac3d303b06f4b70ce00
Commit Summary:
Diffstat:
1 file changed, 3 insertions, 1 deletion
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index db67f8e19344..0016bcc04a59 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -388,7 +388,9 @@ nfsd_sanitize_attrs(struct inode *inode, struct iattr *iap)
iap->ia_mode &= ~S_ISGID;
} else {
/* set ATTR_KILL_* bits and let VFS handle it */
- iap->ia_valid |= (ATTR_KILL_SUID | ATTR_KILL_SGID);
+ iap->ia_valid |= ATTR_KILL_SUID;
+ iap->ia_valid |=
+ setattr_should_drop_sgid(&nop_mnt_idmap, inode);
}
}
}