| Message ID | 164971768254.169983.13280225265874038241.stgit@magnolia (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | fstests: new tests for kernel 5.18 | expand |
On Mon, Apr 11, 2022 at 03:54:42PM -0700, Darrick J. Wong wrote: > From: Darrick J. Wong <djwong@kernel.org> > > fallocate changes file contents, so make sure that we drop privileges > and file capabilities after each fallocate operation. > > Signed-off-by: Darrick J. Wong <djwong@kernel.org> > --- > tests/generic/834 | 127 +++++++++++++++++++++++++++++++++++++++++++++++++ > tests/generic/834.out | 33 +++++++++++++ > tests/generic/835 | 127 +++++++++++++++++++++++++++++++++++++++++++++++++ > tests/generic/835.out | 33 +++++++++++++ > tests/generic/836 | 127 +++++++++++++++++++++++++++++++++++++++++++++++++ > tests/generic/836.out | 33 +++++++++++++ > tests/generic/837 | 127 +++++++++++++++++++++++++++++++++++++++++++++++++ > tests/generic/837.out | 33 +++++++++++++ > tests/generic/838 | 127 +++++++++++++++++++++++++++++++++++++++++++++++++ > tests/generic/838.out | 33 +++++++++++++ > tests/generic/839 | 77 ++++++++++++++++++++++++++++++ > tests/generic/839.out | 13 +++++ > 12 files changed, 890 insertions(+) > create mode 100755 tests/generic/834 > create mode 100644 tests/generic/834.out > create mode 100755 tests/generic/835 > create mode 100644 tests/generic/835.out > create mode 100755 tests/generic/836 > create mode 100644 tests/generic/836.out > create mode 100755 tests/generic/837 > create mode 100644 tests/generic/837.out > create mode 100755 tests/generic/838 > create mode 100644 tests/generic/838.out > create mode 100755 tests/generic/839 > create mode 100755 tests/generic/839.out > > > diff --git a/tests/generic/834 b/tests/generic/834 > new file mode 100755 > index 00000000..9302137b > --- /dev/null > +++ b/tests/generic/834 > @@ -0,0 +1,127 @@ > +#! /bin/bash > +# SPDX-License-Identifier: GPL-2.0 > +# Copyright (c) 2022 Oracle. All Rights Reserved. > +# > +# FS QA Test No. 834 > +# > +# Functional test for dropping suid and sgid bits as part of a fallocate. > +# > +. ./common/preamble > +_begin_fstest auto clone quick > + > +# Override the default cleanup function. > +_cleanup() > +{ > + cd / > + rm -r -f $tmp.* $junk_dir > +} > + > +# Import common functions. > +. ./common/filter > +. ./common/reflink > + > +# real QA test starts here > + > +# Modify as appropriate. > +_supported_fs xfs btrfs ext4 So we have more cases will break downstream XFS testing :) All cases looks good, but according to the custom, all generic cases use "_supported_fs generic", if you have 1+ specified filesystems, maybe "tests/shared/*" is better? > +_require_user > +_require_test > +verb=falloc > +_require_xfs_io_command $verb > + > +junk_dir=$TEST_DIR/$seq > +junk_file=$junk_dir/a > +mkdir -p $junk_dir/ > +chmod a+rw $junk_dir/ > + > +setup_testfile() { > + rm -f $junk_file > + _pwrite_byte 0x58 0 192k $junk_file >> $seqres.full > + sync > +} > + > +commit_and_check() { > + local user="$1" > + local command="$2" > + local start="$3" > + local end="$4" > + > + stat -c '%a %A %n' $junk_file | _filter_test_dir > + > + local cmd="$XFS_IO_PROG -c '$command $start $end' $junk_file" > + if [ -n "$user" ]; then > + su - "$user" -c "$cmd" >> $seqres.full > + else > + $SHELL -c "$cmd" >> $seqres.full > + fi > + > + stat -c '%a %A %n' $junk_file | _filter_test_dir > + > + # Blank line in output > + echo > +} > + > +nr=0 > +# Commit to a non-exec file by an unprivileged user clears suid but > +# leaves sgid. > +nr=$((nr + 1)) > +echo "Test $nr - qa_user, non-exec file $verb" > +setup_testfile > +chmod a+rws $junk_file > +commit_and_check "$qa_user" "$verb" 64k 64k > + > +# Commit to a group-exec file by an unprivileged user clears suid and > +# sgid. > +nr=$((nr + 1)) > +echo "Test $nr - qa_user, group-exec file $verb" > +setup_testfile > +chmod g+x,a+rws $junk_file > +commit_and_check "$qa_user" "$verb" 64k 64k > + > +# Commit to a user-exec file by an unprivileged user clears suid but > +# not sgid. > +nr=$((nr + 1)) > +echo "Test $nr - qa_user, user-exec file $verb" > +setup_testfile > +chmod u+x,a+rws,g-x $junk_file > +commit_and_check "$qa_user" "$verb" 64k 64k > + > +# Commit to a all-exec file by an unprivileged user clears suid and > +# sgid. > +nr=$((nr + 1)) > +echo "Test $nr - qa_user, all-exec file $verb" > +setup_testfile > +chmod a+rwxs $junk_file > +commit_and_check "$qa_user" "$verb" 64k 64k > + > +# Commit to a non-exec file by root clears suid but leaves sgid. > +nr=$((nr + 1)) > +echo "Test $nr - root, non-exec file $verb" > +setup_testfile > +chmod a+rws $junk_file > +commit_and_check "" "$verb" 64k 64k > + > +# Commit to a group-exec file by root clears suid and sgid. > +nr=$((nr + 1)) > +echo "Test $nr - root, group-exec file $verb" > +setup_testfile > +chmod g+x,a+rws $junk_file > +commit_and_check "" "$verb" 64k 64k > + > +# Commit to a user-exec file by root clears suid but not sgid. > +nr=$((nr + 1)) > +echo "Test $nr - root, user-exec file $verb" > +setup_testfile > +chmod u+x,a+rws,g-x $junk_file > +commit_and_check "" "$verb" 64k 64k > + > +# Commit to a all-exec file by root clears suid and sgid. > +nr=$((nr + 1)) > +echo "Test $nr - root, all-exec file $verb" > +setup_testfile > +chmod a+rwxs $junk_file > +commit_and_check "" "$verb" 64k 64k > + > +# success, all done > +status=0 > +exit > diff --git a/tests/generic/834.out b/tests/generic/834.out > new file mode 100644 > index 00000000..2226eea6 > --- /dev/null > +++ b/tests/generic/834.out > @@ -0,0 +1,33 @@ > +QA output created by 834 > +Test 1 - qa_user, non-exec file falloc > +6666 -rwSrwSrw- TEST_DIR/834/a > +666 -rw-rw-rw- TEST_DIR/834/a > + > +Test 2 - qa_user, group-exec file falloc > +6676 -rwSrwsrw- TEST_DIR/834/a > +676 -rw-rwxrw- TEST_DIR/834/a > + > +Test 3 - qa_user, user-exec file falloc > +6766 -rwsrwSrw- TEST_DIR/834/a > +766 -rwxrw-rw- TEST_DIR/834/a > + > +Test 4 - qa_user, all-exec file falloc > +6777 -rwsrwsrwx TEST_DIR/834/a > +777 -rwxrwxrwx TEST_DIR/834/a > + > +Test 5 - root, non-exec file falloc > +6666 -rwSrwSrw- TEST_DIR/834/a > +6666 -rwSrwSrw- TEST_DIR/834/a > + > +Test 6 - root, group-exec file falloc > +6676 -rwSrwsrw- TEST_DIR/834/a > +6676 -rwSrwsrw- TEST_DIR/834/a > + > +Test 7 - root, user-exec file falloc > +6766 -rwsrwSrw- TEST_DIR/834/a > +6766 -rwsrwSrw- TEST_DIR/834/a > + > +Test 8 - root, all-exec file falloc > +6777 -rwsrwsrwx TEST_DIR/834/a > +6777 -rwsrwsrwx TEST_DIR/834/a > + > diff --git a/tests/generic/835 b/tests/generic/835 > new file mode 100755 > index 00000000..b0dc9cc3 > --- /dev/null > +++ b/tests/generic/835 > @@ -0,0 +1,127 @@ > +#! /bin/bash > +# SPDX-License-Identifier: GPL-2.0 > +# Copyright (c) 2022 Oracle. All Rights Reserved. > +# > +# FS QA Test No. 835 > +# > +# Functional test for dropping suid and sgid bits as part of a fpunch. > +# > +. ./common/preamble > +_begin_fstest auto clone quick > + > +# Override the default cleanup function. > +_cleanup() > +{ > + cd / > + rm -r -f $tmp.* $junk_dir > +} > + > +# Import common functions. > +. ./common/filter > +. ./common/reflink > + > +# real QA test starts here > + > +# Modify as appropriate. > +_supported_fs xfs btrfs ext4 > +_require_user > +_require_test > +verb=fpunch > +_require_xfs_io_command $verb > + > +junk_dir=$TEST_DIR/$seq > +junk_file=$junk_dir/a > +mkdir -p $junk_dir/ > +chmod a+rw $junk_dir/ > + > +setup_testfile() { > + rm -f $junk_file > + _pwrite_byte 0x58 0 192k $junk_file >> $seqres.full > + sync > +} > + > +commit_and_check() { > + local user="$1" > + local command="$2" > + local start="$3" > + local end="$4" > + > + stat -c '%a %A %n' $junk_file | _filter_test_dir > + > + local cmd="$XFS_IO_PROG -c '$command $start $end' $junk_file" > + if [ -n "$user" ]; then > + su - "$user" -c "$cmd" >> $seqres.full > + else > + $SHELL -c "$cmd" >> $seqres.full > + fi > + > + stat -c '%a %A %n' $junk_file | _filter_test_dir > + > + # Blank line in output > + echo > +} > + > +nr=0 > +# Commit to a non-exec file by an unprivileged user clears suid but > +# leaves sgid. > +nr=$((nr + 1)) > +echo "Test $nr - qa_user, non-exec file $verb" > +setup_testfile > +chmod a+rws $junk_file > +commit_and_check "$qa_user" "$verb" 64k 64k > + > +# Commit to a group-exec file by an unprivileged user clears suid and > +# sgid. > +nr=$((nr + 1)) > +echo "Test $nr - qa_user, group-exec file $verb" > +setup_testfile > +chmod g+x,a+rws $junk_file > +commit_and_check "$qa_user" "$verb" 64k 64k > + > +# Commit to a user-exec file by an unprivileged user clears suid but > +# not sgid. > +nr=$((nr + 1)) > +echo "Test $nr - qa_user, user-exec file $verb" > +setup_testfile > +chmod u+x,a+rws,g-x $junk_file > +commit_and_check "$qa_user" "$verb" 64k 64k > + > +# Commit to a all-exec file by an unprivileged user clears suid and > +# sgid. > +nr=$((nr + 1)) > +echo "Test $nr - qa_user, all-exec file $verb" > +setup_testfile > +chmod a+rwxs $junk_file > +commit_and_check "$qa_user" "$verb" 64k 64k > + > +# Commit to a non-exec file by root clears suid but leaves sgid. > +nr=$((nr + 1)) > +echo "Test $nr - root, non-exec file $verb" > +setup_testfile > +chmod a+rws $junk_file > +commit_and_check "" "$verb" 64k 64k > + > +# Commit to a group-exec file by root clears suid and sgid. > +nr=$((nr + 1)) > +echo "Test $nr - root, group-exec file $verb" > +setup_testfile > +chmod g+x,a+rws $junk_file > +commit_and_check "" "$verb" 64k 64k > + > +# Commit to a user-exec file by root clears suid but not sgid. > +nr=$((nr + 1)) > +echo "Test $nr - root, user-exec file $verb" > +setup_testfile > +chmod u+x,a+rws,g-x $junk_file > +commit_and_check "" "$verb" 64k 64k > + > +# Commit to a all-exec file by root clears suid and sgid. > +nr=$((nr + 1)) > +echo "Test $nr - root, all-exec file $verb" > +setup_testfile > +chmod a+rwxs $junk_file > +commit_and_check "" "$verb" 64k 64k > + > +# success, all done > +status=0 > +exit > diff --git a/tests/generic/835.out b/tests/generic/835.out > new file mode 100644 > index 00000000..186d7da4 > --- /dev/null > +++ b/tests/generic/835.out > @@ -0,0 +1,33 @@ > +QA output created by 835 > +Test 1 - qa_user, non-exec file fpunch > +6666 -rwSrwSrw- TEST_DIR/835/a > +666 -rw-rw-rw- TEST_DIR/835/a > + > +Test 2 - qa_user, group-exec file fpunch > +6676 -rwSrwsrw- TEST_DIR/835/a > +676 -rw-rwxrw- TEST_DIR/835/a > + > +Test 3 - qa_user, user-exec file fpunch > +6766 -rwsrwSrw- TEST_DIR/835/a > +766 -rwxrw-rw- TEST_DIR/835/a > + > +Test 4 - qa_user, all-exec file fpunch > +6777 -rwsrwsrwx TEST_DIR/835/a > +777 -rwxrwxrwx TEST_DIR/835/a > + > +Test 5 - root, non-exec file fpunch > +6666 -rwSrwSrw- TEST_DIR/835/a > +6666 -rwSrwSrw- TEST_DIR/835/a > + > +Test 6 - root, group-exec file fpunch > +6676 -rwSrwsrw- TEST_DIR/835/a > +6676 -rwSrwsrw- TEST_DIR/835/a > + > +Test 7 - root, user-exec file fpunch > +6766 -rwsrwSrw- TEST_DIR/835/a > +6766 -rwsrwSrw- TEST_DIR/835/a > + > +Test 8 - root, all-exec file fpunch > +6777 -rwsrwsrwx TEST_DIR/835/a > +6777 -rwsrwsrwx TEST_DIR/835/a > + > diff --git a/tests/generic/836 b/tests/generic/836 > new file mode 100755 > index 00000000..ff0cf092 > --- /dev/null > +++ b/tests/generic/836 > @@ -0,0 +1,127 @@ > +#! /bin/bash > +# SPDX-License-Identifier: GPL-2.0 > +# Copyright (c) 2022 Oracle. All Rights Reserved. > +# > +# FS QA Test No. 836 > +# > +# Functional test for dropping suid and sgid bits as part of a fzero. > +# > +. ./common/preamble > +_begin_fstest auto clone quick > + > +# Override the default cleanup function. > +_cleanup() > +{ > + cd / > + rm -r -f $tmp.* $junk_dir > +} > + > +# Import common functions. > +. ./common/filter > +. ./common/reflink > + > +# real QA test starts here > + > +# Modify as appropriate. > +_supported_fs xfs btrfs ext4 > +_require_user > +_require_test > +verb=fzero > +_require_xfs_io_command $verb > + > +junk_dir=$TEST_DIR/$seq > +junk_file=$junk_dir/a > +mkdir -p $junk_dir/ > +chmod a+rw $junk_dir/ > + > +setup_testfile() { > + rm -f $junk_file > + _pwrite_byte 0x58 0 192k $junk_file >> $seqres.full > + sync > +} > + > +commit_and_check() { > + local user="$1" > + local command="$2" > + local start="$3" > + local end="$4" > + > + stat -c '%a %A %n' $junk_file | _filter_test_dir > + > + local cmd="$XFS_IO_PROG -c '$command $start $end' $junk_file" > + if [ -n "$user" ]; then > + su - "$user" -c "$cmd" >> $seqres.full > + else > + $SHELL -c "$cmd" >> $seqres.full > + fi > + > + stat -c '%a %A %n' $junk_file | _filter_test_dir > + > + # Blank line in output > + echo > +} > + > +nr=0 > +# Commit to a non-exec file by an unprivileged user clears suid but > +# leaves sgid. > +nr=$((nr + 1)) > +echo "Test $nr - qa_user, non-exec file $verb" > +setup_testfile > +chmod a+rws $junk_file > +commit_and_check "$qa_user" "$verb" 64k 64k > + > +# Commit to a group-exec file by an unprivileged user clears suid and > +# sgid. > +nr=$((nr + 1)) > +echo "Test $nr - qa_user, group-exec file $verb" > +setup_testfile > +chmod g+x,a+rws $junk_file > +commit_and_check "$qa_user" "$verb" 64k 64k > + > +# Commit to a user-exec file by an unprivileged user clears suid but > +# not sgid. > +nr=$((nr + 1)) > +echo "Test $nr - qa_user, user-exec file $verb" > +setup_testfile > +chmod u+x,a+rws,g-x $junk_file > +commit_and_check "$qa_user" "$verb" 64k 64k > + > +# Commit to a all-exec file by an unprivileged user clears suid and > +# sgid. > +nr=$((nr + 1)) > +echo "Test $nr - qa_user, all-exec file $verb" > +setup_testfile > +chmod a+rwxs $junk_file > +commit_and_check "$qa_user" "$verb" 64k 64k > + > +# Commit to a non-exec file by root clears suid but leaves sgid. > +nr=$((nr + 1)) > +echo "Test $nr - root, non-exec file $verb" > +setup_testfile > +chmod a+rws $junk_file > +commit_and_check "" "$verb" 64k 64k > + > +# Commit to a group-exec file by root clears suid and sgid. > +nr=$((nr + 1)) > +echo "Test $nr - root, group-exec file $verb" > +setup_testfile > +chmod g+x,a+rws $junk_file > +commit_and_check "" "$verb" 64k 64k > + > +# Commit to a user-exec file by root clears suid but not sgid. > +nr=$((nr + 1)) > +echo "Test $nr - root, user-exec file $verb" > +setup_testfile > +chmod u+x,a+rws,g-x $junk_file > +commit_and_check "" "$verb" 64k 64k > + > +# Commit to a all-exec file by root clears suid and sgid. > +nr=$((nr + 1)) > +echo "Test $nr - root, all-exec file $verb" > +setup_testfile > +chmod a+rwxs $junk_file > +commit_and_check "" "$verb" 64k 64k > + > +# success, all done > +status=0 > +exit > diff --git a/tests/generic/836.out b/tests/generic/836.out > new file mode 100644 > index 00000000..9f9f5f12 > --- /dev/null > +++ b/tests/generic/836.out > @@ -0,0 +1,33 @@ > +QA output created by 836 > +Test 1 - qa_user, non-exec file fzero > +6666 -rwSrwSrw- TEST_DIR/836/a > +666 -rw-rw-rw- TEST_DIR/836/a > + > +Test 2 - qa_user, group-exec file fzero > +6676 -rwSrwsrw- TEST_DIR/836/a > +676 -rw-rwxrw- TEST_DIR/836/a > + > +Test 3 - qa_user, user-exec file fzero > +6766 -rwsrwSrw- TEST_DIR/836/a > +766 -rwxrw-rw- TEST_DIR/836/a > + > +Test 4 - qa_user, all-exec file fzero > +6777 -rwsrwsrwx TEST_DIR/836/a > +777 -rwxrwxrwx TEST_DIR/836/a > + > +Test 5 - root, non-exec file fzero > +6666 -rwSrwSrw- TEST_DIR/836/a > +6666 -rwSrwSrw- TEST_DIR/836/a > + > +Test 6 - root, group-exec file fzero > +6676 -rwSrwsrw- TEST_DIR/836/a > +6676 -rwSrwsrw- TEST_DIR/836/a > + > +Test 7 - root, user-exec file fzero > +6766 -rwsrwSrw- TEST_DIR/836/a > +6766 -rwsrwSrw- TEST_DIR/836/a > + > +Test 8 - root, all-exec file fzero > +6777 -rwsrwsrwx TEST_DIR/836/a > +6777 -rwsrwsrwx TEST_DIR/836/a > + > diff --git a/tests/generic/837 b/tests/generic/837 > new file mode 100755 > index 00000000..477b8f21 > --- /dev/null > +++ b/tests/generic/837 > @@ -0,0 +1,127 @@ > +#! /bin/bash > +# SPDX-License-Identifier: GPL-2.0 > +# Copyright (c) 2022 Oracle. All Rights Reserved. > +# > +# FS QA Test No. 837 > +# > +# Functional test for dropping suid and sgid bits as part of a finsert. > +# > +. ./common/preamble > +_begin_fstest auto clone quick > + > +# Override the default cleanup function. > +_cleanup() > +{ > + cd / > + rm -r -f $tmp.* $junk_dir > +} > + > +# Import common functions. > +. ./common/filter > +. ./common/reflink > + > +# real QA test starts here > + > +# Modify as appropriate. > +_supported_fs xfs btrfs ext4 > +_require_user > +_require_test > +verb=finsert > +_require_xfs_io_command $verb > + > +junk_dir=$TEST_DIR/$seq > +junk_file=$junk_dir/a > +mkdir -p $junk_dir/ > +chmod a+rw $junk_dir/ > + > +setup_testfile() { > + rm -f $junk_file > + _pwrite_byte 0x58 0 192k $junk_file >> $seqres.full > + sync > +} > + > +commit_and_check() { > + local user="$1" > + local command="$2" > + local start="$3" > + local end="$4" > + > + stat -c '%a %A %n' $junk_file | _filter_test_dir > + > + local cmd="$XFS_IO_PROG -c '$command $start $end' $junk_file" > + if [ -n "$user" ]; then > + su - "$user" -c "$cmd" >> $seqres.full > + else > + $SHELL -c "$cmd" >> $seqres.full > + fi > + > + stat -c '%a %A %n' $junk_file | _filter_test_dir > + > + # Blank line in output > + echo > +} > + > +nr=0 > +# Commit to a non-exec file by an unprivileged user clears suid but > +# leaves sgid. > +nr=$((nr + 1)) > +echo "Test $nr - qa_user, non-exec file $verb" > +setup_testfile > +chmod a+rws $junk_file > +commit_and_check "$qa_user" "$verb" 64k 64k > + > +# Commit to a group-exec file by an unprivileged user clears suid and > +# sgid. > +nr=$((nr + 1)) > +echo "Test $nr - qa_user, group-exec file $verb" > +setup_testfile > +chmod g+x,a+rws $junk_file > +commit_and_check "$qa_user" "$verb" 64k 64k > + > +# Commit to a user-exec file by an unprivileged user clears suid but > +# not sgid. > +nr=$((nr + 1)) > +echo "Test $nr - qa_user, user-exec file $verb" > +setup_testfile > +chmod u+x,a+rws,g-x $junk_file > +commit_and_check "$qa_user" "$verb" 64k 64k > + > +# Commit to a all-exec file by an unprivileged user clears suid and > +# sgid. > +nr=$((nr + 1)) > +echo "Test $nr - qa_user, all-exec file $verb" > +setup_testfile > +chmod a+rwxs $junk_file > +commit_and_check "$qa_user" "$verb" 64k 64k > + > +# Commit to a non-exec file by root clears suid but leaves sgid. > +nr=$((nr + 1)) > +echo "Test $nr - root, non-exec file $verb" > +setup_testfile > +chmod a+rws $junk_file > +commit_and_check "" "$verb" 64k 64k > + > +# Commit to a group-exec file by root clears suid and sgid. > +nr=$((nr + 1)) > +echo "Test $nr - root, group-exec file $verb" > +setup_testfile > +chmod g+x,a+rws $junk_file > +commit_and_check "" "$verb" 64k 64k > + > +# Commit to a user-exec file by root clears suid but not sgid. > +nr=$((nr + 1)) > +echo "Test $nr - root, user-exec file $verb" > +setup_testfile > +chmod u+x,a+rws,g-x $junk_file > +commit_and_check "" "$verb" 64k 64k > + > +# Commit to a all-exec file by root clears suid and sgid. > +nr=$((nr + 1)) > +echo "Test $nr - root, all-exec file $verb" > +setup_testfile > +chmod a+rwxs $junk_file > +commit_and_check "" "$verb" 64k 64k > + > +# success, all done > +status=0 > +exit > diff --git a/tests/generic/837.out b/tests/generic/837.out > new file mode 100644 > index 00000000..686b806e > --- /dev/null > +++ b/tests/generic/837.out > @@ -0,0 +1,33 @@ > +QA output created by 837 > +Test 1 - qa_user, non-exec file finsert > +6666 -rwSrwSrw- TEST_DIR/837/a > +666 -rw-rw-rw- TEST_DIR/837/a > + > +Test 2 - qa_user, group-exec file finsert > +6676 -rwSrwsrw- TEST_DIR/837/a > +676 -rw-rwxrw- TEST_DIR/837/a > + > +Test 3 - qa_user, user-exec file finsert > +6766 -rwsrwSrw- TEST_DIR/837/a > +766 -rwxrw-rw- TEST_DIR/837/a > + > +Test 4 - qa_user, all-exec file finsert > +6777 -rwsrwsrwx TEST_DIR/837/a > +777 -rwxrwxrwx TEST_DIR/837/a > + > +Test 5 - root, non-exec file finsert > +6666 -rwSrwSrw- TEST_DIR/837/a > +6666 -rwSrwSrw- TEST_DIR/837/a > + > +Test 6 - root, group-exec file finsert > +6676 -rwSrwsrw- TEST_DIR/837/a > +6676 -rwSrwsrw- TEST_DIR/837/a > + > +Test 7 - root, user-exec file finsert > +6766 -rwsrwSrw- TEST_DIR/837/a > +6766 -rwsrwSrw- TEST_DIR/837/a > + > +Test 8 - root, all-exec file finsert > +6777 -rwsrwsrwx TEST_DIR/837/a > +6777 -rwsrwsrwx TEST_DIR/837/a > + > diff --git a/tests/generic/838 b/tests/generic/838 > new file mode 100755 > index 00000000..d7c7e5a8 > --- /dev/null > +++ b/tests/generic/838 > @@ -0,0 +1,127 @@ > +#! /bin/bash > +# SPDX-License-Identifier: GPL-2.0 > +# Copyright (c) 2022 Oracle. All Rights Reserved. > +# > +# FS QA Test No. 838 > +# > +# Functional test for dropping suid and sgid bits as part of a fcollapse. > +# > +. ./common/preamble > +_begin_fstest auto clone quick > + > +# Override the default cleanup function. > +_cleanup() > +{ > + cd / > + rm -r -f $tmp.* $junk_dir > +} > + > +# Import common functions. > +. ./common/filter > +. ./common/reflink > + > +# real QA test starts here > + > +# Modify as appropriate. > +_supported_fs xfs btrfs ext4 > +_require_user > +_require_test > +verb=fcollapse > +_require_xfs_io_command $verb > + > +junk_dir=$TEST_DIR/$seq > +junk_file=$junk_dir/a > +mkdir -p $junk_dir/ > +chmod a+rw $junk_dir/ > + > +setup_testfile() { > + rm -f $junk_file > + _pwrite_byte 0x58 0 192k $junk_file >> $seqres.full > + sync > +} > + > +commit_and_check() { > + local user="$1" > + local command="$2" > + local start="$3" > + local end="$4" > + > + stat -c '%a %A %n' $junk_file | _filter_test_dir > + > + local cmd="$XFS_IO_PROG -c '$command $start $end' $junk_file" > + if [ -n "$user" ]; then > + su - "$user" -c "$cmd" >> $seqres.full > + else > + $SHELL -c "$cmd" >> $seqres.full > + fi > + > + stat -c '%a %A %n' $junk_file | _filter_test_dir > + > + # Blank line in output > + echo > +} > + > +nr=0 > +# Commit to a non-exec file by an unprivileged user clears suid but > +# leaves sgid. > +nr=$((nr + 1)) > +echo "Test $nr - qa_user, non-exec file $verb" > +setup_testfile > +chmod a+rws $junk_file > +commit_and_check "$qa_user" "$verb" 64k 64k > + > +# Commit to a group-exec file by an unprivileged user clears suid and > +# sgid. > +nr=$((nr + 1)) > +echo "Test $nr - qa_user, group-exec file $verb" > +setup_testfile > +chmod g+x,a+rws $junk_file > +commit_and_check "$qa_user" "$verb" 64k 64k > + > +# Commit to a user-exec file by an unprivileged user clears suid but > +# not sgid. > +nr=$((nr + 1)) > +echo "Test $nr - qa_user, user-exec file $verb" > +setup_testfile > +chmod u+x,a+rws,g-x $junk_file > +commit_and_check "$qa_user" "$verb" 64k 64k > + > +# Commit to a all-exec file by an unprivileged user clears suid and > +# sgid. > +nr=$((nr + 1)) > +echo "Test $nr - qa_user, all-exec file $verb" > +setup_testfile > +chmod a+rwxs $junk_file > +commit_and_check "$qa_user" "$verb" 64k 64k > + > +# Commit to a non-exec file by root clears suid but leaves sgid. > +nr=$((nr + 1)) > +echo "Test $nr - root, non-exec file $verb" > +setup_testfile > +chmod a+rws $junk_file > +commit_and_check "" "$verb" 64k 64k > + > +# Commit to a group-exec file by root clears suid and sgid. > +nr=$((nr + 1)) > +echo "Test $nr - root, group-exec file $verb" > +setup_testfile > +chmod g+x,a+rws $junk_file > +commit_and_check "" "$verb" 64k 64k > + > +# Commit to a user-exec file by root clears suid but not sgid. > +nr=$((nr + 1)) > +echo "Test $nr - root, user-exec file $verb" > +setup_testfile > +chmod u+x,a+rws,g-x $junk_file > +commit_and_check "" "$verb" 64k 64k > + > +# Commit to a all-exec file by root clears suid and sgid. > +nr=$((nr + 1)) > +echo "Test $nr - root, all-exec file $verb" > +setup_testfile > +chmod a+rwxs $junk_file > +commit_and_check "" "$verb" 64k 64k > + > +# success, all done > +status=0 > +exit > diff --git a/tests/generic/838.out b/tests/generic/838.out > new file mode 100644 > index 00000000..cdc29f4b > --- /dev/null > +++ b/tests/generic/838.out > @@ -0,0 +1,33 @@ > +QA output created by 838 > +Test 1 - qa_user, non-exec file fcollapse > +6666 -rwSrwSrw- TEST_DIR/838/a > +666 -rw-rw-rw- TEST_DIR/838/a > + > +Test 2 - qa_user, group-exec file fcollapse > +6676 -rwSrwsrw- TEST_DIR/838/a > +676 -rw-rwxrw- TEST_DIR/838/a > + > +Test 3 - qa_user, user-exec file fcollapse > +6766 -rwsrwSrw- TEST_DIR/838/a > +766 -rwxrw-rw- TEST_DIR/838/a > + > +Test 4 - qa_user, all-exec file fcollapse > +6777 -rwsrwsrwx TEST_DIR/838/a > +777 -rwxrwxrwx TEST_DIR/838/a > + > +Test 5 - root, non-exec file fcollapse > +6666 -rwSrwSrw- TEST_DIR/838/a > +6666 -rwSrwSrw- TEST_DIR/838/a > + > +Test 6 - root, group-exec file fcollapse > +6676 -rwSrwsrw- TEST_DIR/838/a > +6676 -rwSrwsrw- TEST_DIR/838/a > + > +Test 7 - root, user-exec file fcollapse > +6766 -rwsrwSrw- TEST_DIR/838/a > +6766 -rwsrwSrw- TEST_DIR/838/a > + > +Test 8 - root, all-exec file fcollapse > +6777 -rwsrwsrwx TEST_DIR/838/a > +6777 -rwsrwsrwx TEST_DIR/838/a > + > diff --git a/tests/generic/839 b/tests/generic/839 > new file mode 100755 > index 00000000..70bef5fc > --- /dev/null > +++ b/tests/generic/839 > @@ -0,0 +1,77 @@ > +#! /bin/bash > +# SPDX-License-Identifier: GPL-2.0 > +# Copyright (c) 2022 Oracle. All Rights Reserved. > +# > +# FS QA Test No. 839 > +# > +# Functional test for dropping capability bits as part of an fallocate. > +# > +. ./common/preamble > +_begin_fstest auto prealloc quick > + > +# Override the default cleanup function. > +_cleanup() > +{ > + cd / > + rm -r -f $tmp.* $junk_dir > +} > + > +# Import common functions. > +. ./common/filter > + > +# real QA test starts here > + > +# Modify as appropriate. > +_supported_fs xfs btrfs ext4 > +_require_user > +_require_command "$GETCAP_PROG" getcap > +_require_command "$SETCAP_PROG" setcap > +_require_xfs_io_command falloc > +_require_test > + > +junk_dir=$TEST_DIR/$seq > +junk_file=$junk_dir/a > +mkdir -p $junk_dir/ > +chmod a+rw $junk_dir/ > + > +setup_testfile() { > + rm -f $junk_file > + touch $junk_file > + chmod a+rwx $junk_file > + $SETCAP_PROG cap_setgid,cap_setuid+ep $junk_file > + sync > +} > + > +commit_and_check() { > + local user="$1" > + > + stat -c '%a %A %n' $junk_file | _filter_test_dir > + _getcap -v $junk_file | _filter_test_dir > + > + local cmd="$XFS_IO_PROG -c 'falloc 0 64k' $junk_file" > + if [ -n "$user" ]; then > + su - "$user" -c "$cmd" >> $seqres.full > + else > + $SHELL -c "$cmd" >> $seqres.full > + fi > + > + stat -c '%a %A %n' $junk_file | _filter_test_dir > + _getcap -v $junk_file | _filter_test_dir > + > + # Blank line in output > + echo > +} > + > +# Commit by an unprivileged user clears capability bits. > +echo "Test 1 - qa_user" > +setup_testfile > +commit_and_check "$qa_user" > + > +# Commit by root leaves capability bits. > +echo "Test 2 - root" > +setup_testfile > +commit_and_check > + > +# success, all done > +status=0 > +exit > diff --git a/tests/generic/839.out b/tests/generic/839.out > new file mode 100755 > index 00000000..f571cd26 > --- /dev/null > +++ b/tests/generic/839.out > @@ -0,0 +1,13 @@ > +QA output created by 839 > +Test 1 - qa_user > +777 -rwxrwxrwx TEST_DIR/839/a > +TEST_DIR/839/a cap_setgid,cap_setuid=ep > +777 -rwxrwxrwx TEST_DIR/839/a > +TEST_DIR/839/a > + > +Test 2 - root > +777 -rwxrwxrwx TEST_DIR/839/a > +TEST_DIR/839/a cap_setgid,cap_setuid=ep > +777 -rwxrwxrwx TEST_DIR/839/a > +TEST_DIR/839/a > + >
On Wed, Apr 13, 2022 at 1:18 AM Zorro Lang <zlang@redhat.com> wrote: > > On Mon, Apr 11, 2022 at 03:54:42PM -0700, Darrick J. Wong wrote: > > From: Darrick J. Wong <djwong@kernel.org> > > > > fallocate changes file contents, so make sure that we drop privileges > > and file capabilities after each fallocate operation. > > > > Signed-off-by: Darrick J. Wong <djwong@kernel.org> > > --- > > tests/generic/834 | 127 +++++++++++++++++++++++++++++++++++++++++++++++++ > > tests/generic/834.out | 33 +++++++++++++ > > tests/generic/835 | 127 +++++++++++++++++++++++++++++++++++++++++++++++++ > > tests/generic/835.out | 33 +++++++++++++ > > tests/generic/836 | 127 +++++++++++++++++++++++++++++++++++++++++++++++++ > > tests/generic/836.out | 33 +++++++++++++ > > tests/generic/837 | 127 +++++++++++++++++++++++++++++++++++++++++++++++++ > > tests/generic/837.out | 33 +++++++++++++ > > tests/generic/838 | 127 +++++++++++++++++++++++++++++++++++++++++++++++++ > > tests/generic/838.out | 33 +++++++++++++ > > tests/generic/839 | 77 ++++++++++++++++++++++++++++++ > > tests/generic/839.out | 13 +++++ > > 12 files changed, 890 insertions(+) > > create mode 100755 tests/generic/834 > > create mode 100644 tests/generic/834.out > > create mode 100755 tests/generic/835 > > create mode 100644 tests/generic/835.out > > create mode 100755 tests/generic/836 > > create mode 100644 tests/generic/836.out > > create mode 100755 tests/generic/837 > > create mode 100644 tests/generic/837.out > > create mode 100755 tests/generic/838 > > create mode 100644 tests/generic/838.out > > create mode 100755 tests/generic/839 > > create mode 100755 tests/generic/839.out > > > > > > diff --git a/tests/generic/834 b/tests/generic/834 > > new file mode 100755 > > index 00000000..9302137b > > --- /dev/null > > +++ b/tests/generic/834 > > @@ -0,0 +1,127 @@ > > +#! /bin/bash > > +# SPDX-License-Identifier: GPL-2.0 > > +# Copyright (c) 2022 Oracle. All Rights Reserved. > > +# > > +# FS QA Test No. 834 > > +# > > +# Functional test for dropping suid and sgid bits as part of a fallocate. > > +# > > +. ./common/preamble > > +_begin_fstest auto clone quick > > + > > +# Override the default cleanup function. > > +_cleanup() > > +{ > > + cd / > > + rm -r -f $tmp.* $junk_dir > > +} > > + > > +# Import common functions. > > +. ./common/filter > > +. ./common/reflink > > + > > +# real QA test starts here > > + > > +# Modify as appropriate. > > +_supported_fs xfs btrfs ext4 > > So we have more cases will break downstream XFS testing :) Funny you should mention that. I was going to propose an RFC for something like: _fixed_by_kernel_commit fbe7e5200365 "xfs: fallocate() should call file_modified()" The first thing that could be done with this standard annotation is print a hint on failure, like LTP does: HINT: You _MAY_ be missing kernel fixes: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=fbe7e5200365 The second thing to be done is that downstream testers could use a script to auto-generate an expunge list for their test kernel, if they don't care about testing known issues, only regressions. I hope that with the new maintainship you will also take the opportunity to make fstests more friendly to downstream kernel testers. > All cases looks good, but according to the custom, all generic cases use > "_supported_fs generic", if you have 1+ specified filesystems, maybe > "tests/shared/*" is better? > I think we should stay away from tests/shared for as much as possible and use it only for very specific fs behaviors. What in the behavior of fallocate() and setgid makes it so special that it needs to be restricted to "xfs btrfs ext4" and not treated as a bug for other fs? I suspect that it might be difficult or impossible to change that behavior in network filesystems? When facing a similar dilemma in the past we ended up with a whitelist _fstyp_has_non_default_seek_data_hole(), but not sure we need to resort to that. Thanks, Amir.
On Wed, Apr 13, 2022 at 10:58:41AM +0300, Amir Goldstein wrote: > On Wed, Apr 13, 2022 at 1:18 AM Zorro Lang <zlang@redhat.com> wrote: > > > > On Mon, Apr 11, 2022 at 03:54:42PM -0700, Darrick J. Wong wrote: > > > From: Darrick J. Wong <djwong@kernel.org> > > > > > > fallocate changes file contents, so make sure that we drop privileges > > > and file capabilities after each fallocate operation. > > > > > > Signed-off-by: Darrick J. Wong <djwong@kernel.org> > > > --- > > > tests/generic/834 | 127 +++++++++++++++++++++++++++++++++++++++++++++++++ > > > tests/generic/834.out | 33 +++++++++++++ > > > tests/generic/835 | 127 +++++++++++++++++++++++++++++++++++++++++++++++++ > > > tests/generic/835.out | 33 +++++++++++++ > > > tests/generic/836 | 127 +++++++++++++++++++++++++++++++++++++++++++++++++ > > > tests/generic/836.out | 33 +++++++++++++ > > > tests/generic/837 | 127 +++++++++++++++++++++++++++++++++++++++++++++++++ > > > tests/generic/837.out | 33 +++++++++++++ > > > tests/generic/838 | 127 +++++++++++++++++++++++++++++++++++++++++++++++++ > > > tests/generic/838.out | 33 +++++++++++++ > > > tests/generic/839 | 77 ++++++++++++++++++++++++++++++ > > > tests/generic/839.out | 13 +++++ > > > 12 files changed, 890 insertions(+) > > > create mode 100755 tests/generic/834 > > > create mode 100644 tests/generic/834.out > > > create mode 100755 tests/generic/835 > > > create mode 100644 tests/generic/835.out > > > create mode 100755 tests/generic/836 > > > create mode 100644 tests/generic/836.out > > > create mode 100755 tests/generic/837 > > > create mode 100644 tests/generic/837.out > > > create mode 100755 tests/generic/838 > > > create mode 100644 tests/generic/838.out > > > create mode 100755 tests/generic/839 > > > create mode 100755 tests/generic/839.out > > > > > > > > > diff --git a/tests/generic/834 b/tests/generic/834 > > > new file mode 100755 > > > index 00000000..9302137b > > > --- /dev/null > > > +++ b/tests/generic/834 > > > @@ -0,0 +1,127 @@ > > > +#! /bin/bash > > > +# SPDX-License-Identifier: GPL-2.0 > > > +# Copyright (c) 2022 Oracle. All Rights Reserved. > > > +# > > > +# FS QA Test No. 834 > > > +# > > > +# Functional test for dropping suid and sgid bits as part of a fallocate. > > > +# > > > +. ./common/preamble > > > +_begin_fstest auto clone quick > > > + > > > +# Override the default cleanup function. > > > +_cleanup() > > > +{ > > > + cd / > > > + rm -r -f $tmp.* $junk_dir > > > +} > > > + > > > +# Import common functions. > > > +. ./common/filter > > > +. ./common/reflink > > > + > > > +# real QA test starts here > > > + > > > +# Modify as appropriate. > > > +_supported_fs xfs btrfs ext4 > > > > So we have more cases will break downstream XFS testing :) > > Funny you should mention that. > I was going to propose an RFC for something like: > > _fixed_by_kernel_commit fbe7e5200365 "xfs: fallocate() should call > file_modified()" > > The first thing that could be done with this standard annotation is print a > hint on failure, like LTP does: > > HINT: You _MAY_ be missing kernel fixes: > > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=fbe7e5200365 I think it's not difficult to implement this behavior in xfstests. Generally if a case covers a known bug, we record the patch commit in case description. As my habit, if a test case fails, I'd like to read the case source code directly, to get more details about the failure, and check if there's a known issue(commit id) covered by that. If there is, check if the kernel I'm testing contains this commit. From my experience, if a case fails as it's expect, that's easy to find out, if the comments is good. Print a hint will help, but won't help much I think, due to the hint is just a guess, we still need to read source code or do more testing to make sure that, when we hit a failure first time. But most of time we always hit unexpected failures, that takes longer time to check. > > The second thing to be done is that downstream testers could use a script > to auto-generate an expunge list for their test kernel, if they don't care about > testing known issues, only regressions. In my testing on RHEL (downstream), I record and update known issues, include known failures and panic/hang issues (need to skip) for each RHEL release. Before running xfstests, I try to get a skip list for a specified RHEL/kernel version. Then compare with its known failures after testing done, to decide if a failure is known/unknown. Also I created version tags for my redhat internal xfstests repo, for some downstream of downstream kernel testing (likes Z-stream testing) can use fixed xfstests version. Some known issue format I record as below[1], a bash script will help to parse it and compare with testing results. It's only for our internal use, due to I think it's too crude to be shared :-P [1] $ cat known_results/$distro/xfs/145.json [ { "DESCRIPTION": "bz19483*** XFS: Assertion failed: dqp->q_res_bcount >= be64_to_cpu(dqp->q_core.d_bcount)", "FS": ["xfs"], "DMESG": "Assertion failed: dqp->q_res_bcount >= be64_to_cpu\\(dqp->q_core.d_bcount\\)", "FIXED": true } ] $ cat known_results/$distro/generic/417.json [ { "DESCRIPTION": "bz16255*** (<1%): XFS corruption attribute entry #0 in attr block 0, inode 674 is INCOMPLETE", "FS": ["xfs"], "ARCH": ["ppc64le"], "OUTBAD": "_check_xfs_filesystem.*inconsistent", "FULL": "attribute entry.*in attr block.*, inode.*is INCOMPLETE" } ] > > I hope that with the new maintainship you will also take the opportunity > to make fstests more friendly to downstream kernel testers. > > > All cases looks good, but according to the custom, all generic cases use > > "_supported_fs generic", if you have 1+ specified filesystems, maybe > > "tests/shared/*" is better? > > > > I think we should stay away from tests/shared for as much as possible and > use it only for very specific fs behaviors. I prefer generic testing too :) > > What in the behavior of fallocate() and setgid makes it so special that it needs > to be restricted to "xfs btrfs ext4" and not treated as a bug for other fs? > I suspect that it might be difficult or impossible to change that behavior in > network filesystems? I'm not sure what other filesystems think about this behavior. If this's a standard or most common behavior, I hope it can be a generic test (then let other fs maintainers worry about their new testing failure:-P). Likes generic/673 was written for XFS, then btrfs found failure, then btrfs said XFS should follow VFS as btrfs does :) > > When facing a similar dilemma in the past we ended up with a whitelist > _fstyp_has_non_default_seek_data_hole(), but not sure we need to resort to that. > > Thanks, > Amir. >
On Wed, Apr 13, 2022 at 11:44:01PM +0800, Zorro Lang wrote: > On Wed, Apr 13, 2022 at 10:58:41AM +0300, Amir Goldstein wrote: > > On Wed, Apr 13, 2022 at 1:18 AM Zorro Lang <zlang@redhat.com> wrote: > > > > > > On Mon, Apr 11, 2022 at 03:54:42PM -0700, Darrick J. Wong wrote: > > > > From: Darrick J. Wong <djwong@kernel.org> > > > > > > > > fallocate changes file contents, so make sure that we drop privileges > > > > and file capabilities after each fallocate operation. > > > > > > > > Signed-off-by: Darrick J. Wong <djwong@kernel.org> > > > > --- > > > > tests/generic/834 | 127 +++++++++++++++++++++++++++++++++++++++++++++++++ > > > > tests/generic/834.out | 33 +++++++++++++ > > > > tests/generic/835 | 127 +++++++++++++++++++++++++++++++++++++++++++++++++ > > > > tests/generic/835.out | 33 +++++++++++++ > > > > tests/generic/836 | 127 +++++++++++++++++++++++++++++++++++++++++++++++++ > > > > tests/generic/836.out | 33 +++++++++++++ > > > > tests/generic/837 | 127 +++++++++++++++++++++++++++++++++++++++++++++++++ > > > > tests/generic/837.out | 33 +++++++++++++ > > > > tests/generic/838 | 127 +++++++++++++++++++++++++++++++++++++++++++++++++ > > > > tests/generic/838.out | 33 +++++++++++++ > > > > tests/generic/839 | 77 ++++++++++++++++++++++++++++++ > > > > tests/generic/839.out | 13 +++++ > > > > 12 files changed, 890 insertions(+) > > > > create mode 100755 tests/generic/834 > > > > create mode 100644 tests/generic/834.out > > > > create mode 100755 tests/generic/835 > > > > create mode 100644 tests/generic/835.out > > > > create mode 100755 tests/generic/836 > > > > create mode 100644 tests/generic/836.out > > > > create mode 100755 tests/generic/837 > > > > create mode 100644 tests/generic/837.out > > > > create mode 100755 tests/generic/838 > > > > create mode 100644 tests/generic/838.out > > > > create mode 100755 tests/generic/839 > > > > create mode 100755 tests/generic/839.out > > > > > > > > > > > > diff --git a/tests/generic/834 b/tests/generic/834 > > > > new file mode 100755 > > > > index 00000000..9302137b > > > > --- /dev/null > > > > +++ b/tests/generic/834 > > > > @@ -0,0 +1,127 @@ > > > > +#! /bin/bash > > > > +# SPDX-License-Identifier: GPL-2.0 > > > > +# Copyright (c) 2022 Oracle. All Rights Reserved. > > > > +# > > > > +# FS QA Test No. 834 > > > > +# > > > > +# Functional test for dropping suid and sgid bits as part of a fallocate. > > > > +# > > > > +. ./common/preamble > > > > +_begin_fstest auto clone quick > > > > + > > > > +# Override the default cleanup function. > > > > +_cleanup() > > > > +{ > > > > + cd / > > > > + rm -r -f $tmp.* $junk_dir > > > > +} > > > > + > > > > +# Import common functions. > > > > +. ./common/filter > > > > +. ./common/reflink > > > > + > > > > +# real QA test starts here > > > > + > > > > +# Modify as appropriate. > > > > +_supported_fs xfs btrfs ext4 > > > > > > So we have more cases will break downstream XFS testing :) > > > > Funny you should mention that. > > I was going to propose an RFC for something like: > > > > _fixed_by_kernel_commit fbe7e5200365 "xfs: fallocate() should call > > file_modified()" > > > > The first thing that could be done with this standard annotation is print a > > hint on failure, like LTP does: > > > > HINT: You _MAY_ be missing kernel fixes: > > > > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=fbe7e5200365 > > I think it's not difficult to implement this behavior in xfstests. Generally if > a case covers a known bug, we record the patch commit in case description. It's not hard, but it's a treewide change to identify all the fstests that are regression fixes (or at least mention a commit hash) and well beyond the scope of adding tests for a new fallocate security behavior. In fact, it's an *entirely new project*. One that I don't have time to take on myself as a condition for getting *this* patch merged. > As my habit, if a test case fails, I'd like to read the case source code > directly, to get more details about the failure, and check if there's a known > issue(commit id) covered by that. If there is, check if the kernel I'm testing > contains this commit. > > From my experience, if a case fails as it's expect, that's easy to find out, > if the comments is good. Print a hint will help, but won't help much I think, > due to the hint is just a guess, we still need to read source code or do more > testing to make sure that, when we hit a failure first time. But most of time > we always hit unexpected failures, that takes longer time to check. > > > > > The second thing to be done is that downstream testers could use a script > > to auto-generate an expunge list for their test kernel, if they don't care about > > testing known issues, only regressions. > > In my testing on RHEL (downstream), I record and update known issues, include known > failures and panic/hang issues (need to skip) for each RHEL release. Before running > xfstests, I try to get a skip list for a specified RHEL/kernel version. Then compare > with its known failures after testing done, to decide if a failure is known/unknown. > Also I created version tags for my redhat internal xfstests repo, for some downstream > of downstream kernel testing (likes Z-stream testing) can use fixed xfstests version. > > Some known issue format I record as below[1], a bash script will help to parse it and > compare with testing results. It's only for our internal use, due to I think it's too > crude to be shared :-P > > [1] > $ cat known_results/$distro/xfs/145.json > [ > { > "DESCRIPTION": "bz19483*** XFS: Assertion failed: dqp->q_res_bcount >= be64_to_cpu(dqp->q_core.d_bcount)", > "FS": ["xfs"], > "DMESG": "Assertion failed: dqp->q_res_bcount >= be64_to_cpu\\(dqp->q_core.d_bcount\\)", > "FIXED": true > } > ] > $ cat known_results/$distro/generic/417.json > [ > { > "DESCRIPTION": "bz16255*** (<1%): XFS corruption attribute entry #0 in attr block 0, inode 674 is INCOMPLETE", > "FS": ["xfs"], > "ARCH": ["ppc64le"], > "OUTBAD": "_check_xfs_filesystem.*inconsistent", > "FULL": "attribute entry.*in attr block.*, inode.*is INCOMPLETE" > } > ] > > > > > I hope that with the new maintainship you will also take the opportunity > > to make fstests more friendly to downstream kernel testers. > > > > > All cases looks good, but according to the custom, all generic cases use > > > "_supported_fs generic", if you have 1+ specified filesystems, maybe > > > "tests/shared/*" is better? > > > > > > > I think we should stay away from tests/shared for as much as possible and > > use it only for very specific fs behaviors. > > I prefer generic testing too :) > > > > > What in the behavior of fallocate() and setgid makes it so special that it needs > > to be restricted to "xfs btrfs ext4" and not treated as a bug for other fs? > > I suspect that it might be difficult or impossible to change that behavior in > > network filesystems? > > I'm not sure what other filesystems think about this behavior. If this's a standard > or most common behavior, I hope it can be a generic test (then let other fs maintainers > worry about their new testing failure:-P). Likes generic/673 was written for XFS, > then btrfs found failure, then btrfs said XFS should follow VFS as btrfs does :) It will *become* a new behavior, but I haven't spread it to any other filesystems other than the three listed above. Overlayfs, for example, doesn't clear set.id bits or drop file capabilities, nor do things like f2fs and fat. I'll get to them eventually, but I think I'll have an easier time persuading the other maintainers of this new behavior if I can tell them "Here is a change, and this is an existing fstest that checks the behavior for correctness." --D > > > > > When facing a similar dilemma in the past we ended up with a whitelist > > _fstyp_has_non_default_seek_data_hole(), but not sure we need to resort to that. > > > > Thanks, > > Amir. > > >
On Thu, Apr 14, 2022 at 08:50:07AM -0700, Darrick J. Wong wrote: > On Wed, Apr 13, 2022 at 11:44:01PM +0800, Zorro Lang wrote: > > On Wed, Apr 13, 2022 at 10:58:41AM +0300, Amir Goldstein wrote: > > > On Wed, Apr 13, 2022 at 1:18 AM Zorro Lang <zlang@redhat.com> wrote: > > > > > > > > On Mon, Apr 11, 2022 at 03:54:42PM -0700, Darrick J. Wong wrote: > > > > > From: Darrick J. Wong <djwong@kernel.org> > > > > > > > > > > fallocate changes file contents, so make sure that we drop privileges > > > > > and file capabilities after each fallocate operation. > > > > > > > > > > Signed-off-by: Darrick J. Wong <djwong@kernel.org> > > > > > --- > > > > > tests/generic/834 | 127 +++++++++++++++++++++++++++++++++++++++++++++++++ > > > > > tests/generic/834.out | 33 +++++++++++++ > > > > > tests/generic/835 | 127 +++++++++++++++++++++++++++++++++++++++++++++++++ > > > > > tests/generic/835.out | 33 +++++++++++++ > > > > > tests/generic/836 | 127 +++++++++++++++++++++++++++++++++++++++++++++++++ > > > > > tests/generic/836.out | 33 +++++++++++++ > > > > > tests/generic/837 | 127 +++++++++++++++++++++++++++++++++++++++++++++++++ > > > > > tests/generic/837.out | 33 +++++++++++++ > > > > > tests/generic/838 | 127 +++++++++++++++++++++++++++++++++++++++++++++++++ > > > > > tests/generic/838.out | 33 +++++++++++++ > > > > > tests/generic/839 | 77 ++++++++++++++++++++++++++++++ > > > > > tests/generic/839.out | 13 +++++ > > > > > 12 files changed, 890 insertions(+) > > > > > create mode 100755 tests/generic/834 > > > > > create mode 100644 tests/generic/834.out > > > > > create mode 100755 tests/generic/835 > > > > > create mode 100644 tests/generic/835.out > > > > > create mode 100755 tests/generic/836 > > > > > create mode 100644 tests/generic/836.out > > > > > create mode 100755 tests/generic/837 > > > > > create mode 100644 tests/generic/837.out > > > > > create mode 100755 tests/generic/838 > > > > > create mode 100644 tests/generic/838.out > > > > > create mode 100755 tests/generic/839 > > > > > create mode 100755 tests/generic/839.out > > > > > > > > > > > > > > > diff --git a/tests/generic/834 b/tests/generic/834 > > > > > new file mode 100755 > > > > > index 00000000..9302137b > > > > > --- /dev/null > > > > > +++ b/tests/generic/834 > > > > > @@ -0,0 +1,127 @@ > > > > > +#! /bin/bash > > > > > +# SPDX-License-Identifier: GPL-2.0 > > > > > +# Copyright (c) 2022 Oracle. All Rights Reserved. > > > > > +# > > > > > +# FS QA Test No. 834 > > > > > +# > > > > > +# Functional test for dropping suid and sgid bits as part of a fallocate. > > > > > +# > > > > > +. ./common/preamble > > > > > +_begin_fstest auto clone quick > > > > > + > > > > > +# Override the default cleanup function. > > > > > +_cleanup() > > > > > +{ > > > > > + cd / > > > > > + rm -r -f $tmp.* $junk_dir > > > > > +} > > > > > + > > > > > +# Import common functions. > > > > > +. ./common/filter > > > > > +. ./common/reflink > > > > > + > > > > > +# real QA test starts here > > > > > + > > > > > +# Modify as appropriate. > > > > > +_supported_fs xfs btrfs ext4 > > > > > > > > So we have more cases will break downstream XFS testing :) > > > > > > Funny you should mention that. > > > I was going to propose an RFC for something like: > > > > > > _fixed_by_kernel_commit fbe7e5200365 "xfs: fallocate() should call > > > file_modified()" > > > > > > The first thing that could be done with this standard annotation is print a > > > hint on failure, like LTP does: > > > > > > HINT: You _MAY_ be missing kernel fixes: > > > > > > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=fbe7e5200365 > > > > I think it's not difficult to implement this behavior in xfstests. Generally if > > a case covers a known bug, we record the patch commit in case description. > > It's not hard, but it's a treewide change to identify all the fstests > that are regression fixes (or at least mention a commit hash) and well > beyond the scope of adding tests for a new fallocate security behavior. > > In fact, it's an *entirely new project*. One that I don't have time to > take on myself as a condition for getting *this* patch merged. Hi Darrick, that's another story, you don't need to worry about that in this case :) I'd like to ack this patch, but hope to move it from generic/ to shared/ . Maybe Eryu can help to move it, or I can do that after I get the push permission. The reason why I intend moving it to shared is: Although we are trying to get rid of tests/shared/, but the tests/shared/ still help to remind us what cases are still not real generic cases. We'll try to help all shared cases to be generic. When the time is ready, I'd like to move this case to generic/ and change _supported_fs from "xfs btrfs ext4" to "generic". Reviewed-by: Zorro Lang <zlang@redhat.com> Thanks, Zorro
> > > > > +# Modify as appropriate. > > > > > +_supported_fs xfs btrfs ext4 > > > > > > > > So we have more cases will break downstream XFS testing :) > > > > > > Funny you should mention that. > > > I was going to propose an RFC for something like: > > > > > > _fixed_by_kernel_commit fbe7e5200365 "xfs: fallocate() should call > > > file_modified()" > > > > > > The first thing that could be done with this standard annotation is print a > > > hint on failure, like LTP does: > > > > > > HINT: You _MAY_ be missing kernel fixes: > > > > > > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=fbe7e5200365 > > > > I think it's not difficult to implement this behavior in xfstests. Generally if > > a case covers a known bug, we record the patch commit in case description. > > It's not hard, but it's a treewide change to identify all the fstests > that are regression fixes (or at least mention a commit hash) and well > beyond the scope of adding tests for a new fallocate security behavior. > > In fact, it's an *entirely new project*. One that I don't have time to > take on myself as a condition for getting *this* patch merged. > To be clear, my comment had no intention to serve as a condition for merging your patch and not for suggesting that you should do anything really. My comment was that "I was going to propose an RFC" meaning that I was going to send patches but didn't get to it yet. It's not a treewide project either, it's a simple optional annotation per test, as is the case with LTP's optional .tags array. My plan was to start with annotating the overlay tests and the xfs tests that I collected during my work on v5.10..v.5.17 xfs backports, as they say The change starts with me ;) [...] > > > > > > What in the behavior of fallocate() and setgid makes it so special that it needs > > > to be restricted to "xfs btrfs ext4" and not treated as a bug for other fs? > > > I suspect that it might be difficult or impossible to change that behavior in > > > network filesystems? > > > > I'm not sure what other filesystems think about this behavior. If this's a standard > > or most common behavior, I hope it can be a generic test (then let other fs maintainers > > worry about their new testing failure:-P). Likes generic/673 was written for XFS, > > then btrfs found failure, then btrfs said XFS should follow VFS as btrfs does :) > > It will *become* a new behavior, but I haven't spread it to any other > filesystems other than the three listed above. Overlayfs, for example, > doesn't clear set.id bits or drop file capabilities, nor do things like > f2fs and fat. I'll get to them eventually, but I think I'll have an > easier time persuading the other maintainers of this new behavior if I > can tell them "Here is a change, and this is an existing fstest that > checks the behavior for correctness." > TBH, I am a bit surprised that you sign yourself up to fixing all those other filesystems. It sounds like you got plenty on your plate already. My intention is not to talk you out of doing community work, but to ask what is the best way for developers that find a bug which they do NOT intend to fix, to annotate the test for that bug. I ran into that dilema with overlay/061 which tests for some non-standard behavior regarding mmap that has been there since day 1 and is sufficiently hard to fix. I ended up leaving this test out of "auto" group and in "posix" group. I might have left it in "known" or "broken" group just the same. Regarding *this* patch, why not leave it _supported_fs generic? What are the downsides? Other fs would fail the test as they should. It's not like that new behavior is debatable, it's a proper security issue. And especially for fs that support FALLOC_FL_COLLAPSE_RANGE and FALLOC_FL_INSERT_RANGE, so my other suggestion if you do not wish to inflict this new failure on all other fs is to make the test require finsert and document in a comment why that was done. I know that the test won't run on btrfs with this requirement, but that is not your problem to solve and also I am quite surprised that btrfs does not support finsert/fcollapse, so maybe that support will be added some day and then the security thread that comes with it could be avoided. Thanks, Amir.
> Hi Darrick, that's another story, you don't need to worry about that in this case :) > I'd like to ack this patch, but hope to move it from generic/ to shared/ . Maybe > Eryu can help to move it, or I can do that after I get the push permission. > > The reason why I intend moving it to shared is: > Although we are trying to get rid of tests/shared/, but the tests/shared/ still help to > remind us what cases are still not real generic cases. We'll try to help all shared > cases to be generic. When the time is ready, I'd like to move this case to generic/ > and change _supported_fs from "xfs btrfs ext4" to "generic". > Sorry, but I have to object to this move. I do not think that is what tests/shared should be used for. My preferences are: 1. _suppoted_fs generic && _require_xfs_io_command "finsert" 2. _suppoted_fs generic 3. _supported_fs xfs btrfs ext4 (without moving to tests/shared) Thanks, Amir.
On Fri, Apr 15, 2022 at 04:42:33PM +0300, Amir Goldstein wrote: > > Hi Darrick, that's another story, you don't need to worry about that in this case :) > > I'd like to ack this patch, but hope to move it from generic/ to shared/ . Maybe > > Eryu can help to move it, or I can do that after I get the push permission. > > > > The reason why I intend moving it to shared is: > > Although we are trying to get rid of tests/shared/, but the tests/shared/ still help to > > remind us what cases are still not real generic cases. We'll try to help all shared > > cases to be generic. When the time is ready, I'd like to move this case to generic/ > > and change _supported_fs from "xfs btrfs ext4" to "generic". > > > > Sorry, but I have to object to this move. > I do not think that is what tests/shared should be used for. > > My preferences are: > 1. _suppoted_fs generic && _require_xfs_io_command "finsert" There is: "verb=finsert _require_xfs_io_command $verb" This patch has not only one case, different cases test different mode of fallocate, and I think Darrick has given them different _require_xfs_io_command. > 2. _suppoted_fs generic > 3. _supported_fs xfs btrfs ext4 (without moving to tests/shared) There's not any generic cases write like this, only shared cases like that. My personal opinion is *(2)* or make it shared if it insists "_supported_fs xfs btrfs ext4" (then will move it back to generic and "_suppoted_fs generic" when Darrick think it's time). Thanks, Zorro > > Thanks, > Amir. >
On Sat, Apr 16, 2022 at 5:02 PM Zorro Lang <zlang@redhat.com> wrote: > > On Fri, Apr 15, 2022 at 04:42:33PM +0300, Amir Goldstein wrote: > > > Hi Darrick, that's another story, you don't need to worry about that in this case :) > > > I'd like to ack this patch, but hope to move it from generic/ to shared/ . Maybe > > > Eryu can help to move it, or I can do that after I get the push permission. > > > > > > The reason why I intend moving it to shared is: > > > Although we are trying to get rid of tests/shared/, but the tests/shared/ still help to > > > remind us what cases are still not real generic cases. We'll try to help all shared > > > cases to be generic. When the time is ready, I'd like to move this case to generic/ > > > and change _supported_fs from "xfs btrfs ext4" to "generic". > > > > > > > Sorry, but I have to object to this move. > > I do not think that is what tests/shared should be used for. > > > > My preferences are: > > 1. _suppoted_fs generic && _require_xfs_io_command "finsert" > > There is: > "verb=finsert > _require_xfs_io_command $verb" > > This patch has not only one case, different cases test different mode of fallocate, > and I think Darrick has given them different _require_xfs_io_command. > I know. I meant that the tests for verbs finsert/fcollapse can definitely use generic as there are very few fs that support those verbs and those fs should be fixed, not hide the failure. cifs maintainer btw is using whitelists of tests for CI, so new failing tests are not likely to affect cifs testing. > > 2. _suppoted_fs generic > > 3. _supported_fs xfs btrfs ext4 (without moving to tests/shared) > > There's not any generic cases write like this, only shared cases like that. My personal > opinion is *(2)* or make it shared if it insists "_supported_fs xfs btrfs ext4" (then > will move it back to generic and "_suppoted_fs generic" when Darrick think it's time). > Let's wait to hear what Darrick has to say. I just don't understand the incentive to hide test failures from buggy fs even if this is a change of long time behavior. BTW, here is untested draft of what I started working on: https://github.com/amir73il/xfstests/commits/hints With the new helpers, this test could also be classified as: _suppoted_fs generic _known_issue_on_fs ^xfs ^btrfs ^ext4 Meaning that the test runs on all fs, unless tester opts-out with -x known_issues and if test is run an fails an hint is printed: "You _MAY_ be hit by a known issue on $FSTYP." I'll probably be done with testing those patches and post them tomorrow. Thanks, Amir.
On Fri, Apr 15, 2022 at 04:42:33PM +0300, Amir Goldstein wrote: > > Hi Darrick, that's another story, you don't need to worry about that in this case :) > > I'd like to ack this patch, but hope to move it from generic/ to shared/ . Maybe > > Eryu can help to move it, or I can do that after I get the push permission. > > > > The reason why I intend moving it to shared is: > > Although we are trying to get rid of tests/shared/, but the tests/shared/ still help to > > remind us what cases are still not real generic cases. We'll try to help all shared > > cases to be generic. When the time is ready, I'd like to move this case to generic/ > > and change _supported_fs from "xfs btrfs ext4" to "generic". > > > > Sorry, but I have to object to this move. > I do not think that is what tests/shared should be used for. After reading all the discussions, I prefer option 2 here as well, it's testing for a security bug, and all affected filesystems should be fixed, and a new failure will remind people there's something to be fixed. > > My preferences are: > 1. _suppoted_fs generic && _require_xfs_io_command "finsert" As btrfs doesn't support "finsert", so the falloc/fpunch tests won't run on btrfs, and we miss test coverage there. > 2. _suppoted_fs generic > 3. _supported_fs xfs btrfs ext4 (without moving to tests/shared) This is weired. And if we really want to restrict the new behavior within xfs, btrfs and ext4 for now, then I can live with a whitelist _require rule, and a good comment on it. Thanks, Eryu
On Sun, Apr 17, 2022 at 11:40:32PM +0800, Eryu Guan wrote: > On Fri, Apr 15, 2022 at 04:42:33PM +0300, Amir Goldstein wrote: > > > Hi Darrick, that's another story, you don't need to worry about that in this case :) > > > I'd like to ack this patch, but hope to move it from generic/ to shared/ . Maybe > > > Eryu can help to move it, or I can do that after I get the push permission. > > > > > > The reason why I intend moving it to shared is: > > > Although we are trying to get rid of tests/shared/, but the tests/shared/ still help to > > > remind us what cases are still not real generic cases. We'll try to help all shared > > > cases to be generic. When the time is ready, I'd like to move this case to generic/ > > > and change _supported_fs from "xfs btrfs ext4" to "generic". > > > > > > > Sorry, but I have to object to this move. > > I do not think that is what tests/shared should be used for. > > After reading all the discussions, I prefer option 2 here as well, it's > testing for a security bug, and all affected filesystems should be fixed, > and a new failure will remind people there's something to be fixed. Ok. I'll put it back to _supported_fs generic and leave the tests in tests/generic/. Thank you for making a decision. :) --D > > > > My preferences are: > > 1. _suppoted_fs generic && _require_xfs_io_command "finsert" > > As btrfs doesn't support "finsert", so the falloc/fpunch tests won't run > on btrfs, and we miss test coverage there. > > > 2. _suppoted_fs generic > > 3. _supported_fs xfs btrfs ext4 (without moving to tests/shared) > > This is weired. And if we really want to restrict the new behavior > within xfs, btrfs and ext4 for now, then I can live with a whitelist > _require rule, and a good comment on it. > > Thanks, > Eryu
diff --git a/tests/generic/834 b/tests/generic/834 new file mode 100755 index 00000000..9302137b --- /dev/null +++ b/tests/generic/834 @@ -0,0 +1,127 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2022 Oracle. All Rights Reserved. +# +# FS QA Test No. 834 +# +# Functional test for dropping suid and sgid bits as part of a fallocate. +# +. ./common/preamble +_begin_fstest auto clone quick + +# Override the default cleanup function. +_cleanup() +{ + cd / + rm -r -f $tmp.* $junk_dir +} + +# Import common functions. +. ./common/filter +. ./common/reflink + +# real QA test starts here + +# Modify as appropriate. +_supported_fs xfs btrfs ext4 +_require_user +_require_test +verb=falloc +_require_xfs_io_command $verb + +junk_dir=$TEST_DIR/$seq +junk_file=$junk_dir/a +mkdir -p $junk_dir/ +chmod a+rw $junk_dir/ + +setup_testfile() { + rm -f $junk_file + _pwrite_byte 0x58 0 192k $junk_file >> $seqres.full + sync +} + +commit_and_check() { + local user="$1" + local command="$2" + local start="$3" + local end="$4" + + stat -c '%a %A %n' $junk_file | _filter_test_dir + + local cmd="$XFS_IO_PROG -c '$command $start $end' $junk_file" + if [ -n "$user" ]; then + su - "$user" -c "$cmd" >> $seqres.full + else + $SHELL -c "$cmd" >> $seqres.full + fi + + stat -c '%a %A %n' $junk_file | _filter_test_dir + + # Blank line in output + echo +} + +nr=0 +# Commit to a non-exec file by an unprivileged user clears suid but +# leaves sgid. +nr=$((nr + 1)) +echo "Test $nr - qa_user, non-exec file $verb" +setup_testfile +chmod a+rws $junk_file +commit_and_check "$qa_user" "$verb" 64k 64k + +# Commit to a group-exec file by an unprivileged user clears suid and +# sgid. +nr=$((nr + 1)) +echo "Test $nr - qa_user, group-exec file $verb" +setup_testfile +chmod g+x,a+rws $junk_file +commit_and_check "$qa_user" "$verb" 64k 64k + +# Commit to a user-exec file by an unprivileged user clears suid but +# not sgid. +nr=$((nr + 1)) +echo "Test $nr - qa_user, user-exec file $verb" +setup_testfile +chmod u+x,a+rws,g-x $junk_file +commit_and_check "$qa_user" "$verb" 64k 64k + +# Commit to a all-exec file by an unprivileged user clears suid and +# sgid. +nr=$((nr + 1)) +echo "Test $nr - qa_user, all-exec file $verb" +setup_testfile +chmod a+rwxs $junk_file +commit_and_check "$qa_user" "$verb" 64k 64k + +# Commit to a non-exec file by root clears suid but leaves sgid. +nr=$((nr + 1)) +echo "Test $nr - root, non-exec file $verb" +setup_testfile +chmod a+rws $junk_file +commit_and_check "" "$verb" 64k 64k + +# Commit to a group-exec file by root clears suid and sgid. +nr=$((nr + 1)) +echo "Test $nr - root, group-exec file $verb" +setup_testfile +chmod g+x,a+rws $junk_file +commit_and_check "" "$verb" 64k 64k + +# Commit to a user-exec file by root clears suid but not sgid. +nr=$((nr + 1)) +echo "Test $nr - root, user-exec file $verb" +setup_testfile +chmod u+x,a+rws,g-x $junk_file +commit_and_check "" "$verb" 64k 64k + +# Commit to a all-exec file by root clears suid and sgid. +nr=$((nr + 1)) +echo "Test $nr - root, all-exec file $verb" +setup_testfile +chmod a+rwxs $junk_file +commit_and_check "" "$verb" 64k 64k + +# success, all done +status=0 +exit diff --git a/tests/generic/834.out b/tests/generic/834.out new file mode 100644 index 00000000..2226eea6 --- /dev/null +++ b/tests/generic/834.out @@ -0,0 +1,33 @@ +QA output created by 834 +Test 1 - qa_user, non-exec file falloc +6666 -rwSrwSrw- TEST_DIR/834/a +666 -rw-rw-rw- TEST_DIR/834/a + +Test 2 - qa_user, group-exec file falloc +6676 -rwSrwsrw- TEST_DIR/834/a +676 -rw-rwxrw- TEST_DIR/834/a + +Test 3 - qa_user, user-exec file falloc +6766 -rwsrwSrw- TEST_DIR/834/a +766 -rwxrw-rw- TEST_DIR/834/a + +Test 4 - qa_user, all-exec file falloc +6777 -rwsrwsrwx TEST_DIR/834/a +777 -rwxrwxrwx TEST_DIR/834/a + +Test 5 - root, non-exec file falloc +6666 -rwSrwSrw- TEST_DIR/834/a +6666 -rwSrwSrw- TEST_DIR/834/a + +Test 6 - root, group-exec file falloc +6676 -rwSrwsrw- TEST_DIR/834/a +6676 -rwSrwsrw- TEST_DIR/834/a + +Test 7 - root, user-exec file falloc +6766 -rwsrwSrw- TEST_DIR/834/a +6766 -rwsrwSrw- TEST_DIR/834/a + +Test 8 - root, all-exec file falloc +6777 -rwsrwsrwx TEST_DIR/834/a +6777 -rwsrwsrwx TEST_DIR/834/a + diff --git a/tests/generic/835 b/tests/generic/835 new file mode 100755 index 00000000..b0dc9cc3 --- /dev/null +++ b/tests/generic/835 @@ -0,0 +1,127 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2022 Oracle. All Rights Reserved. +# +# FS QA Test No. 835 +# +# Functional test for dropping suid and sgid bits as part of a fpunch. +# +. ./common/preamble +_begin_fstest auto clone quick + +# Override the default cleanup function. +_cleanup() +{ + cd / + rm -r -f $tmp.* $junk_dir +} + +# Import common functions. +. ./common/filter +. ./common/reflink + +# real QA test starts here + +# Modify as appropriate. +_supported_fs xfs btrfs ext4 +_require_user +_require_test +verb=fpunch +_require_xfs_io_command $verb + +junk_dir=$TEST_DIR/$seq +junk_file=$junk_dir/a +mkdir -p $junk_dir/ +chmod a+rw $junk_dir/ + +setup_testfile() { + rm -f $junk_file + _pwrite_byte 0x58 0 192k $junk_file >> $seqres.full + sync +} + +commit_and_check() { + local user="$1" + local command="$2" + local start="$3" + local end="$4" + + stat -c '%a %A %n' $junk_file | _filter_test_dir + + local cmd="$XFS_IO_PROG -c '$command $start $end' $junk_file" + if [ -n "$user" ]; then + su - "$user" -c "$cmd" >> $seqres.full + else + $SHELL -c "$cmd" >> $seqres.full + fi + + stat -c '%a %A %n' $junk_file | _filter_test_dir + + # Blank line in output + echo +} + +nr=0 +# Commit to a non-exec file by an unprivileged user clears suid but +# leaves sgid. +nr=$((nr + 1)) +echo "Test $nr - qa_user, non-exec file $verb" +setup_testfile +chmod a+rws $junk_file +commit_and_check "$qa_user" "$verb" 64k 64k + +# Commit to a group-exec file by an unprivileged user clears suid and +# sgid. +nr=$((nr + 1)) +echo "Test $nr - qa_user, group-exec file $verb" +setup_testfile +chmod g+x,a+rws $junk_file +commit_and_check "$qa_user" "$verb" 64k 64k + +# Commit to a user-exec file by an unprivileged user clears suid but +# not sgid. +nr=$((nr + 1)) +echo "Test $nr - qa_user, user-exec file $verb" +setup_testfile +chmod u+x,a+rws,g-x $junk_file +commit_and_check "$qa_user" "$verb" 64k 64k + +# Commit to a all-exec file by an unprivileged user clears suid and +# sgid. +nr=$((nr + 1)) +echo "Test $nr - qa_user, all-exec file $verb" +setup_testfile +chmod a+rwxs $junk_file +commit_and_check "$qa_user" "$verb" 64k 64k + +# Commit to a non-exec file by root clears suid but leaves sgid. +nr=$((nr + 1)) +echo "Test $nr - root, non-exec file $verb" +setup_testfile +chmod a+rws $junk_file +commit_and_check "" "$verb" 64k 64k + +# Commit to a group-exec file by root clears suid and sgid. +nr=$((nr + 1)) +echo "Test $nr - root, group-exec file $verb" +setup_testfile +chmod g+x,a+rws $junk_file +commit_and_check "" "$verb" 64k 64k + +# Commit to a user-exec file by root clears suid but not sgid. +nr=$((nr + 1)) +echo "Test $nr - root, user-exec file $verb" +setup_testfile +chmod u+x,a+rws,g-x $junk_file +commit_and_check "" "$verb" 64k 64k + +# Commit to a all-exec file by root clears suid and sgid. +nr=$((nr + 1)) +echo "Test $nr - root, all-exec file $verb" +setup_testfile +chmod a+rwxs $junk_file +commit_and_check "" "$verb" 64k 64k + +# success, all done +status=0 +exit diff --git a/tests/generic/835.out b/tests/generic/835.out new file mode 100644 index 00000000..186d7da4 --- /dev/null +++ b/tests/generic/835.out @@ -0,0 +1,33 @@ +QA output created by 835 +Test 1 - qa_user, non-exec file fpunch +6666 -rwSrwSrw- TEST_DIR/835/a +666 -rw-rw-rw- TEST_DIR/835/a + +Test 2 - qa_user, group-exec file fpunch +6676 -rwSrwsrw- TEST_DIR/835/a +676 -rw-rwxrw- TEST_DIR/835/a + +Test 3 - qa_user, user-exec file fpunch +6766 -rwsrwSrw- TEST_DIR/835/a +766 -rwxrw-rw- TEST_DIR/835/a + +Test 4 - qa_user, all-exec file fpunch +6777 -rwsrwsrwx TEST_DIR/835/a +777 -rwxrwxrwx TEST_DIR/835/a + +Test 5 - root, non-exec file fpunch +6666 -rwSrwSrw- TEST_DIR/835/a +6666 -rwSrwSrw- TEST_DIR/835/a + +Test 6 - root, group-exec file fpunch +6676 -rwSrwsrw- TEST_DIR/835/a +6676 -rwSrwsrw- TEST_DIR/835/a + +Test 7 - root, user-exec file fpunch +6766 -rwsrwSrw- TEST_DIR/835/a +6766 -rwsrwSrw- TEST_DIR/835/a + +Test 8 - root, all-exec file fpunch +6777 -rwsrwsrwx TEST_DIR/835/a +6777 -rwsrwsrwx TEST_DIR/835/a + diff --git a/tests/generic/836 b/tests/generic/836 new file mode 100755 index 00000000..ff0cf092 --- /dev/null +++ b/tests/generic/836 @@ -0,0 +1,127 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2022 Oracle. All Rights Reserved. +# +# FS QA Test No. 836 +# +# Functional test for dropping suid and sgid bits as part of a fzero. +# +. ./common/preamble +_begin_fstest auto clone quick + +# Override the default cleanup function. +_cleanup() +{ + cd / + rm -r -f $tmp.* $junk_dir +} + +# Import common functions. +. ./common/filter +. ./common/reflink + +# real QA test starts here + +# Modify as appropriate. +_supported_fs xfs btrfs ext4 +_require_user +_require_test +verb=fzero +_require_xfs_io_command $verb + +junk_dir=$TEST_DIR/$seq +junk_file=$junk_dir/a +mkdir -p $junk_dir/ +chmod a+rw $junk_dir/ + +setup_testfile() { + rm -f $junk_file + _pwrite_byte 0x58 0 192k $junk_file >> $seqres.full + sync +} + +commit_and_check() { + local user="$1" + local command="$2" + local start="$3" + local end="$4" + + stat -c '%a %A %n' $junk_file | _filter_test_dir + + local cmd="$XFS_IO_PROG -c '$command $start $end' $junk_file" + if [ -n "$user" ]; then + su - "$user" -c "$cmd" >> $seqres.full + else + $SHELL -c "$cmd" >> $seqres.full + fi + + stat -c '%a %A %n' $junk_file | _filter_test_dir + + # Blank line in output + echo +} + +nr=0 +# Commit to a non-exec file by an unprivileged user clears suid but +# leaves sgid. +nr=$((nr + 1)) +echo "Test $nr - qa_user, non-exec file $verb" +setup_testfile +chmod a+rws $junk_file +commit_and_check "$qa_user" "$verb" 64k 64k + +# Commit to a group-exec file by an unprivileged user clears suid and +# sgid. +nr=$((nr + 1)) +echo "Test $nr - qa_user, group-exec file $verb" +setup_testfile +chmod g+x,a+rws $junk_file +commit_and_check "$qa_user" "$verb" 64k 64k + +# Commit to a user-exec file by an unprivileged user clears suid but +# not sgid. +nr=$((nr + 1)) +echo "Test $nr - qa_user, user-exec file $verb" +setup_testfile +chmod u+x,a+rws,g-x $junk_file +commit_and_check "$qa_user" "$verb" 64k 64k + +# Commit to a all-exec file by an unprivileged user clears suid and +# sgid. +nr=$((nr + 1)) +echo "Test $nr - qa_user, all-exec file $verb" +setup_testfile +chmod a+rwxs $junk_file +commit_and_check "$qa_user" "$verb" 64k 64k + +# Commit to a non-exec file by root clears suid but leaves sgid. +nr=$((nr + 1)) +echo "Test $nr - root, non-exec file $verb" +setup_testfile +chmod a+rws $junk_file +commit_and_check "" "$verb" 64k 64k + +# Commit to a group-exec file by root clears suid and sgid. +nr=$((nr + 1)) +echo "Test $nr - root, group-exec file $verb" +setup_testfile +chmod g+x,a+rws $junk_file +commit_and_check "" "$verb" 64k 64k + +# Commit to a user-exec file by root clears suid but not sgid. +nr=$((nr + 1)) +echo "Test $nr - root, user-exec file $verb" +setup_testfile +chmod u+x,a+rws,g-x $junk_file +commit_and_check "" "$verb" 64k 64k + +# Commit to a all-exec file by root clears suid and sgid. +nr=$((nr + 1)) +echo "Test $nr - root, all-exec file $verb" +setup_testfile +chmod a+rwxs $junk_file +commit_and_check "" "$verb" 64k 64k + +# success, all done +status=0 +exit diff --git a/tests/generic/836.out b/tests/generic/836.out new file mode 100644 index 00000000..9f9f5f12 --- /dev/null +++ b/tests/generic/836.out @@ -0,0 +1,33 @@ +QA output created by 836 +Test 1 - qa_user, non-exec file fzero +6666 -rwSrwSrw- TEST_DIR/836/a +666 -rw-rw-rw- TEST_DIR/836/a + +Test 2 - qa_user, group-exec file fzero +6676 -rwSrwsrw- TEST_DIR/836/a +676 -rw-rwxrw- TEST_DIR/836/a + +Test 3 - qa_user, user-exec file fzero +6766 -rwsrwSrw- TEST_DIR/836/a +766 -rwxrw-rw- TEST_DIR/836/a + +Test 4 - qa_user, all-exec file fzero +6777 -rwsrwsrwx TEST_DIR/836/a +777 -rwxrwxrwx TEST_DIR/836/a + +Test 5 - root, non-exec file fzero +6666 -rwSrwSrw- TEST_DIR/836/a +6666 -rwSrwSrw- TEST_DIR/836/a + +Test 6 - root, group-exec file fzero +6676 -rwSrwsrw- TEST_DIR/836/a +6676 -rwSrwsrw- TEST_DIR/836/a + +Test 7 - root, user-exec file fzero +6766 -rwsrwSrw- TEST_DIR/836/a +6766 -rwsrwSrw- TEST_DIR/836/a + +Test 8 - root, all-exec file fzero +6777 -rwsrwsrwx TEST_DIR/836/a +6777 -rwsrwsrwx TEST_DIR/836/a + diff --git a/tests/generic/837 b/tests/generic/837 new file mode 100755 index 00000000..477b8f21 --- /dev/null +++ b/tests/generic/837 @@ -0,0 +1,127 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2022 Oracle. All Rights Reserved. +# +# FS QA Test No. 837 +# +# Functional test for dropping suid and sgid bits as part of a finsert. +# +. ./common/preamble +_begin_fstest auto clone quick + +# Override the default cleanup function. +_cleanup() +{ + cd / + rm -r -f $tmp.* $junk_dir +} + +# Import common functions. +. ./common/filter +. ./common/reflink + +# real QA test starts here + +# Modify as appropriate. +_supported_fs xfs btrfs ext4 +_require_user +_require_test +verb=finsert +_require_xfs_io_command $verb + +junk_dir=$TEST_DIR/$seq +junk_file=$junk_dir/a +mkdir -p $junk_dir/ +chmod a+rw $junk_dir/ + +setup_testfile() { + rm -f $junk_file + _pwrite_byte 0x58 0 192k $junk_file >> $seqres.full + sync +} + +commit_and_check() { + local user="$1" + local command="$2" + local start="$3" + local end="$4" + + stat -c '%a %A %n' $junk_file | _filter_test_dir + + local cmd="$XFS_IO_PROG -c '$command $start $end' $junk_file" + if [ -n "$user" ]; then + su - "$user" -c "$cmd" >> $seqres.full + else + $SHELL -c "$cmd" >> $seqres.full + fi + + stat -c '%a %A %n' $junk_file | _filter_test_dir + + # Blank line in output + echo +} + +nr=0 +# Commit to a non-exec file by an unprivileged user clears suid but +# leaves sgid. +nr=$((nr + 1)) +echo "Test $nr - qa_user, non-exec file $verb" +setup_testfile +chmod a+rws $junk_file +commit_and_check "$qa_user" "$verb" 64k 64k + +# Commit to a group-exec file by an unprivileged user clears suid and +# sgid. +nr=$((nr + 1)) +echo "Test $nr - qa_user, group-exec file $verb" +setup_testfile +chmod g+x,a+rws $junk_file +commit_and_check "$qa_user" "$verb" 64k 64k + +# Commit to a user-exec file by an unprivileged user clears suid but +# not sgid. +nr=$((nr + 1)) +echo "Test $nr - qa_user, user-exec file $verb" +setup_testfile +chmod u+x,a+rws,g-x $junk_file +commit_and_check "$qa_user" "$verb" 64k 64k + +# Commit to a all-exec file by an unprivileged user clears suid and +# sgid. +nr=$((nr + 1)) +echo "Test $nr - qa_user, all-exec file $verb" +setup_testfile +chmod a+rwxs $junk_file +commit_and_check "$qa_user" "$verb" 64k 64k + +# Commit to a non-exec file by root clears suid but leaves sgid. +nr=$((nr + 1)) +echo "Test $nr - root, non-exec file $verb" +setup_testfile +chmod a+rws $junk_file +commit_and_check "" "$verb" 64k 64k + +# Commit to a group-exec file by root clears suid and sgid. +nr=$((nr + 1)) +echo "Test $nr - root, group-exec file $verb" +setup_testfile +chmod g+x,a+rws $junk_file +commit_and_check "" "$verb" 64k 64k + +# Commit to a user-exec file by root clears suid but not sgid. +nr=$((nr + 1)) +echo "Test $nr - root, user-exec file $verb" +setup_testfile +chmod u+x,a+rws,g-x $junk_file +commit_and_check "" "$verb" 64k 64k + +# Commit to a all-exec file by root clears suid and sgid. +nr=$((nr + 1)) +echo "Test $nr - root, all-exec file $verb" +setup_testfile +chmod a+rwxs $junk_file +commit_and_check "" "$verb" 64k 64k + +# success, all done +status=0 +exit diff --git a/tests/generic/837.out b/tests/generic/837.out new file mode 100644 index 00000000..686b806e --- /dev/null +++ b/tests/generic/837.out @@ -0,0 +1,33 @@ +QA output created by 837 +Test 1 - qa_user, non-exec file finsert +6666 -rwSrwSrw- TEST_DIR/837/a +666 -rw-rw-rw- TEST_DIR/837/a + +Test 2 - qa_user, group-exec file finsert +6676 -rwSrwsrw- TEST_DIR/837/a +676 -rw-rwxrw- TEST_DIR/837/a + +Test 3 - qa_user, user-exec file finsert +6766 -rwsrwSrw- TEST_DIR/837/a +766 -rwxrw-rw- TEST_DIR/837/a + +Test 4 - qa_user, all-exec file finsert +6777 -rwsrwsrwx TEST_DIR/837/a +777 -rwxrwxrwx TEST_DIR/837/a + +Test 5 - root, non-exec file finsert +6666 -rwSrwSrw- TEST_DIR/837/a +6666 -rwSrwSrw- TEST_DIR/837/a + +Test 6 - root, group-exec file finsert +6676 -rwSrwsrw- TEST_DIR/837/a +6676 -rwSrwsrw- TEST_DIR/837/a + +Test 7 - root, user-exec file finsert +6766 -rwsrwSrw- TEST_DIR/837/a +6766 -rwsrwSrw- TEST_DIR/837/a + +Test 8 - root, all-exec file finsert +6777 -rwsrwsrwx TEST_DIR/837/a +6777 -rwsrwsrwx TEST_DIR/837/a + diff --git a/tests/generic/838 b/tests/generic/838 new file mode 100755 index 00000000..d7c7e5a8 --- /dev/null +++ b/tests/generic/838 @@ -0,0 +1,127 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2022 Oracle. All Rights Reserved. +# +# FS QA Test No. 838 +# +# Functional test for dropping suid and sgid bits as part of a fcollapse. +# +. ./common/preamble +_begin_fstest auto clone quick + +# Override the default cleanup function. +_cleanup() +{ + cd / + rm -r -f $tmp.* $junk_dir +} + +# Import common functions. +. ./common/filter +. ./common/reflink + +# real QA test starts here + +# Modify as appropriate. +_supported_fs xfs btrfs ext4 +_require_user +_require_test +verb=fcollapse +_require_xfs_io_command $verb + +junk_dir=$TEST_DIR/$seq +junk_file=$junk_dir/a +mkdir -p $junk_dir/ +chmod a+rw $junk_dir/ + +setup_testfile() { + rm -f $junk_file + _pwrite_byte 0x58 0 192k $junk_file >> $seqres.full + sync +} + +commit_and_check() { + local user="$1" + local command="$2" + local start="$3" + local end="$4" + + stat -c '%a %A %n' $junk_file | _filter_test_dir + + local cmd="$XFS_IO_PROG -c '$command $start $end' $junk_file" + if [ -n "$user" ]; then + su - "$user" -c "$cmd" >> $seqres.full + else + $SHELL -c "$cmd" >> $seqres.full + fi + + stat -c '%a %A %n' $junk_file | _filter_test_dir + + # Blank line in output + echo +} + +nr=0 +# Commit to a non-exec file by an unprivileged user clears suid but +# leaves sgid. +nr=$((nr + 1)) +echo "Test $nr - qa_user, non-exec file $verb" +setup_testfile +chmod a+rws $junk_file +commit_and_check "$qa_user" "$verb" 64k 64k + +# Commit to a group-exec file by an unprivileged user clears suid and +# sgid. +nr=$((nr + 1)) +echo "Test $nr - qa_user, group-exec file $verb" +setup_testfile +chmod g+x,a+rws $junk_file +commit_and_check "$qa_user" "$verb" 64k 64k + +# Commit to a user-exec file by an unprivileged user clears suid but +# not sgid. +nr=$((nr + 1)) +echo "Test $nr - qa_user, user-exec file $verb" +setup_testfile +chmod u+x,a+rws,g-x $junk_file +commit_and_check "$qa_user" "$verb" 64k 64k + +# Commit to a all-exec file by an unprivileged user clears suid and +# sgid. +nr=$((nr + 1)) +echo "Test $nr - qa_user, all-exec file $verb" +setup_testfile +chmod a+rwxs $junk_file +commit_and_check "$qa_user" "$verb" 64k 64k + +# Commit to a non-exec file by root clears suid but leaves sgid. +nr=$((nr + 1)) +echo "Test $nr - root, non-exec file $verb" +setup_testfile +chmod a+rws $junk_file +commit_and_check "" "$verb" 64k 64k + +# Commit to a group-exec file by root clears suid and sgid. +nr=$((nr + 1)) +echo "Test $nr - root, group-exec file $verb" +setup_testfile +chmod g+x,a+rws $junk_file +commit_and_check "" "$verb" 64k 64k + +# Commit to a user-exec file by root clears suid but not sgid. +nr=$((nr + 1)) +echo "Test $nr - root, user-exec file $verb" +setup_testfile +chmod u+x,a+rws,g-x $junk_file +commit_and_check "" "$verb" 64k 64k + +# Commit to a all-exec file by root clears suid and sgid. +nr=$((nr + 1)) +echo "Test $nr - root, all-exec file $verb" +setup_testfile +chmod a+rwxs $junk_file +commit_and_check "" "$verb" 64k 64k + +# success, all done +status=0 +exit diff --git a/tests/generic/838.out b/tests/generic/838.out new file mode 100644 index 00000000..cdc29f4b --- /dev/null +++ b/tests/generic/838.out @@ -0,0 +1,33 @@ +QA output created by 838 +Test 1 - qa_user, non-exec file fcollapse +6666 -rwSrwSrw- TEST_DIR/838/a +666 -rw-rw-rw- TEST_DIR/838/a + +Test 2 - qa_user, group-exec file fcollapse +6676 -rwSrwsrw- TEST_DIR/838/a +676 -rw-rwxrw- TEST_DIR/838/a + +Test 3 - qa_user, user-exec file fcollapse +6766 -rwsrwSrw- TEST_DIR/838/a +766 -rwxrw-rw- TEST_DIR/838/a + +Test 4 - qa_user, all-exec file fcollapse +6777 -rwsrwsrwx TEST_DIR/838/a +777 -rwxrwxrwx TEST_DIR/838/a + +Test 5 - root, non-exec file fcollapse +6666 -rwSrwSrw- TEST_DIR/838/a +6666 -rwSrwSrw- TEST_DIR/838/a + +Test 6 - root, group-exec file fcollapse +6676 -rwSrwsrw- TEST_DIR/838/a +6676 -rwSrwsrw- TEST_DIR/838/a + +Test 7 - root, user-exec file fcollapse +6766 -rwsrwSrw- TEST_DIR/838/a +6766 -rwsrwSrw- TEST_DIR/838/a + +Test 8 - root, all-exec file fcollapse +6777 -rwsrwsrwx TEST_DIR/838/a +6777 -rwsrwsrwx TEST_DIR/838/a + diff --git a/tests/generic/839 b/tests/generic/839 new file mode 100755 index 00000000..70bef5fc --- /dev/null +++ b/tests/generic/839 @@ -0,0 +1,77 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2022 Oracle. All Rights Reserved. +# +# FS QA Test No. 839 +# +# Functional test for dropping capability bits as part of an fallocate. +# +. ./common/preamble +_begin_fstest auto prealloc quick + +# Override the default cleanup function. +_cleanup() +{ + cd / + rm -r -f $tmp.* $junk_dir +} + +# Import common functions. +. ./common/filter + +# real QA test starts here + +# Modify as appropriate. +_supported_fs xfs btrfs ext4 +_require_user +_require_command "$GETCAP_PROG" getcap +_require_command "$SETCAP_PROG" setcap +_require_xfs_io_command falloc +_require_test + +junk_dir=$TEST_DIR/$seq +junk_file=$junk_dir/a +mkdir -p $junk_dir/ +chmod a+rw $junk_dir/ + +setup_testfile() { + rm -f $junk_file + touch $junk_file + chmod a+rwx $junk_file + $SETCAP_PROG cap_setgid,cap_setuid+ep $junk_file + sync +} + +commit_and_check() { + local user="$1" + + stat -c '%a %A %n' $junk_file | _filter_test_dir + _getcap -v $junk_file | _filter_test_dir + + local cmd="$XFS_IO_PROG -c 'falloc 0 64k' $junk_file" + if [ -n "$user" ]; then + su - "$user" -c "$cmd" >> $seqres.full + else + $SHELL -c "$cmd" >> $seqres.full + fi + + stat -c '%a %A %n' $junk_file | _filter_test_dir + _getcap -v $junk_file | _filter_test_dir + + # Blank line in output + echo +} + +# Commit by an unprivileged user clears capability bits. +echo "Test 1 - qa_user" +setup_testfile +commit_and_check "$qa_user" + +# Commit by root leaves capability bits. +echo "Test 2 - root" +setup_testfile +commit_and_check + +# success, all done +status=0 +exit diff --git a/tests/generic/839.out b/tests/generic/839.out new file mode 100755 index 00000000..f571cd26 --- /dev/null +++ b/tests/generic/839.out @@ -0,0 +1,13 @@ +QA output created by 839 +Test 1 - qa_user +777 -rwxrwxrwx TEST_DIR/839/a +TEST_DIR/839/a cap_setgid,cap_setuid=ep +777 -rwxrwxrwx TEST_DIR/839/a +TEST_DIR/839/a + +Test 2 - root +777 -rwxrwxrwx TEST_DIR/839/a +TEST_DIR/839/a cap_setgid,cap_setuid=ep +777 -rwxrwxrwx TEST_DIR/839/a +TEST_DIR/839/a +