This is a note to let you know that I've just added the patch titled
nfsd: use vfs setgid helper
to the 6.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
nfsd-use-vfs-setgid-helper.patch
and it can be found in the queue-6.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 2d8ae8c417db284f598dffb178cc01e7db0f1821 Mon Sep 17 00:00:00 2001
From: Christian Brauner <brauner@xxxxxxxxxx>
Date: Tue, 2 May 2023 15:36:02 +0200
Subject: nfsd: use vfs setgid helper
From: Christian Brauner <brauner@xxxxxxxxxx>
commit 2d8ae8c417db284f598dffb178cc01e7db0f1821 upstream.
We've aligned setgid behavior over multiple kernel releases. The details
can be found in commit cf619f891971 ("Merge tag 'fs.ovl.setgid.v6.2' of
git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping") and
commit 426b4ca2d6a5 ("Merge tag 'fs.setgid.v6.0' of
git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux").
Consistent setgid stripping behavior is now encapsulated in the
setattr_should_drop_sgid() helper which is used by all filesystems that
strip setgid bits outside of vfs proper. Usually ATTR_KILL_SGID is
raised in e.g., chown_common() and is subject to the
setattr_should_drop_sgid() check to determine whether the setgid bit can
be retained. Since nfsd is raising ATTR_KILL_SGID unconditionally it
will cause notify_change() to strip it even if the caller had the
necessary privileges to retain it. Ensure that nfsd only raises
ATR_KILL_SGID if the caller lacks the necessary privileges to retain the
setgid bit.
Without this patch the setgid stripping tests in LTP will fail:
> As you can see, the problem is S_ISGID (0002000) was dropped on a
> non-group-executable file while chown was invoked by super-user, while
[...]
> fchown02.c:66: TFAIL: testfile2: wrong mode permissions 0100700, expected 0102700
[...]
> chown02.c:57: TFAIL: testfile2: wrong mode permissions 0100700, expected 0102700
With this patch all tests pass.
Reported-by: Sherry Yang <sherry.yang@xxxxxxxxxx>
Signed-off-by: Christian Brauner <brauner@xxxxxxxxxx>
Reviewed-by: Jeff Layton <jlayton@xxxxxxxxxx>
Cc: <stable@xxxxxxxxxxxxxxx>
Signed-off-by: Chuck Lever <chuck.lever@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
fs/nfsd/vfs.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -388,7 +388,9 @@ nfsd_sanitize_attrs(struct inode *inode,
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);
}
}
}
Patches currently in stable-queue which might be from brauner@xxxxxxxxxx are
queue-6.4/fs-establish-locking-order-for-unrelated-directories.patch
queue-6.4/jffs2-reduce-stack-usage-in-jffs2_build_xattr_subsystem.patch
queue-6.4/revert-f2fs-fix-potential-corruption-when-moving-a-directory.patch
queue-6.4/ext4-remove-ext4-locking-of-moved-directory.patch
queue-6.4/fs-pipe-reveal-missing-function-protoypes.patch
queue-6.4/fanotify-disallow-mount-sb-marks-on-kernel-internal-.patch
queue-6.4/watch_queue-prevent-dangling-pipe-pointer.patch
queue-6.4/fs-lock-moved-directories.patch
queue-6.4/splice-fix-filemap_splice_read-to-use-the-correct-in.patch
queue-6.4/nfsd-use-vfs-setgid-helper.patch
queue-6.4/fs-avoid-empty-option-when-generating-legacy-mount-string.patch
queue-6.4/splice-don-t-call-file_accessed-in-copy_splice_read.patch
queue-6.4/sctp-add-bpf_bypass_getsockopt-proto-callback.patch
queue-6.4/revert-udf-protect-rename-against-modification-of-moved-directory.patch
