xfs: Add test for CVE-2017-14340
PATCH 1/1 xfs: Add test for CVE-2017-14340
Verify kernel doesn't panic when user attempts to set realtime flags on non-realtime FS, using kernel compiled with CONFIG_XFS_RT. Unpatched kernels will panic during this test. Kernels not compiled with CONFIG_XFS_RT should pass test.
This bug was fixed via commit b31ff3cdf540110da4572e3e29bd172087af65cc on the main kernel tree.
--- tests/xfs/431 | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/431.out | 3 ++ tests/xfs/group | 1 + 3 files changed, 90 insertions(+) create mode 100755 tests/xfs/431 create mode 100644 tests/xfs/431.out
tests/xfs/431 new file +86 -0
@@ -0,0 +1,86 @@ +#! /bin/bash +# FS QA Test 431 +# +# Verify kernel doesn't panic when user attempts to set realtime flags +# on non-realtime FS, using kernel compiled with CONFIG_XFS_RT. Unpatched +# kernels will panic during this test. Kernels not compiled with +# CONFIG_XFS_RT should pass test. +# +#----------------------------------------------------------------------- +# Copyright (c) 2017 YOUR NAME HERE. All Rights Reserved. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it would be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +#----------------------------------------------------------------------- +# + +seq=`basename $0` +seqres=$RESULT_DIR/$seq +echo "QA output created by $seq" + +here=`pwd` +tmp=/tmp/$$ +status=1 # failure is the default! +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_cleanup() +{ + cd / + rm -f $tmp.* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter + +# remove previous $seqres.full before test +rm -f $seqres.full + +# real QA test starts here + +# Modify as appropriate. +_supported_fs xfs +_supported_os Linux +_require_xfs_io_command "chattr" +_require_xfs_io_command "fsync" +_require_xfs_io_command "pwrite" +_require_scratch +_require_test + +_scratch_mkfs >/dev/null 2>&1 +_scratch_mount + +# Set realtime inherit flag on scratch mount, suppress output +# as this may simply error out on future kernels, we will check +# exit code instead. +$XFS_IO_PROG -c 'chattr +t' $SCRATCH_MNT &> /dev/null +chattr_ret=$? + +# Erroring out here is fine, this would be desired behavior for +# FSes without realtime devices present. +if (( chattr_ret == 0)); then + # Attempt to write/fsync data to file + $XFS_IO_PROG -fc 'pwrite 0 1m' -c fsync $SCRATCH_MNT/testfile | + tee -a $seqres.full | common_line_filter | _filter_xfs_io + + # Remove the rt inherit flag after we are done or xfs_repair + # will fail. + $XFS_IO_PROG -c 'chattr -t' $SCRATCH_MNT | tee -a $seqres.full 2>&1 +fi + + +rm -f $SCRATCH_MNT/testfile + +# success, all done +status=0 +exit
tests/xfs/431.out new file +3 -0
@@ -0,0 +1,3 @@ +QA output created by 431 +wrote 1048576/1048576 bytes at offset 0 +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
tests/xfs/group +1 -0
@@ -427,3 +427,4 @@ 428 dangerous_fuzzers dangerous_scrub dangerous_online_repair 429 dangerous_fuzzers dangerous_scrub dangerous_repair 430 dangerous_fuzzers dangerous_scrub dangerous_online_repair +431 quick
Signature · 1 line
2.9.5
Quoted 6 lines · Richard Wareing
Verify kernel doesn't panic when user attempts to set realtime flags on non-realtime FS, using kernel compiled with
CONFIG_XFS_RT. Unpatched kernels will panic during this test. Kernels not compiled withCONFIG_XFS_RTshould pass test.This bug was fixed via commit
b31ff3cdf540110da4572e3e29bd172087af65cc
Oooh, a commit id, nice! :)
Quoted 17 lines
on the main kernel tree.
Signed-off-by Richard Wareing <[email protected]>--- tests/xfs/431 | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/431.out | 3 ++ tests/xfs/group | 1 + 3 files changed, 90 insertions(+) create mode 100755 tests/xfs/431 create mode 100644 tests/xfs/431.outtests/xfs/431 new file +0
-0
tests/xfs/431 line 10
Quoted 10 lines
tests/xfs/431 new file +10
-0@@ -0,0 +1,86 @@ +#! /bin/bash +# FS QA Test 431 +# +# Verify kernel doesn't panic when user attempts to set realtime flags +# on non-realtime FS, using kernel compiled with CONFIG_XFS_RT. Unpatched +# kernels will panic during this test. Kernels not compiled with +# CONFIG_XFS_RT should pass test. +# +#----------------------------------------------------------------------- +# Copyright (c) 2017 YOUR NAME HERE. All Rights Reserved.
Mr. HERE, please update this line! :)
Quoted 39 lines
tests/xfs/431 new file +39
-0+# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it would be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +#----------------------------------------------------------------------- +# + +seq=`basename $0` +seqres=$RESULT_DIR/$seq +echo "QA output created by $seq" + +here=`pwd` +tmp=/tmp/$$ +status=1 # failure is the default! +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_cleanup() +{ + cd / + rm -f $tmp.* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter + +# remove previous $seqres.full before test +rm -f $seqres.full + +# real QA test starts here
tests/xfs/431 line 59
Quoted 10 lines
tests/xfs/431 new file +10
-0+ +# Modify as appropriate. +_supported_fs xfs +_supported_os Linux +_require_xfs_io_command "chattr" +_require_xfs_io_command "fsync" +_require_xfs_io_command "pwrite" +_require_scratch +_require_test +
Shouldn't we unset USE_EXTERNAL/SCRATCH_RTDEV here since the bug only affects non-rt xfses?
Quoted 41 lines
tests/xfs/431 new file +27
-0+_scratch_mkfs >/dev/null 2>&1 +_scratch_mount + +# Set realtime inherit flag on scratch mount, suppress output +# as this may simply error out on future kernels, we will check +# exit code instead. +$XFS_IO_PROG -c 'chattr +t' $SCRATCH_MNT &> /dev/null +chattr_ret=$? + +# Erroring out here is fine, this would be desired behavior for +# FSes without realtime devices present. +if (( chattr_ret == 0)); then + # Attempt to write/fsync data to file + $XFS_IO_PROG -fc 'pwrite 0 1m' -c fsync $SCRATCH_MNT/testfile | + tee -a $seqres.full | common_line_filter | _filter_xfs_io + + # Remove the rt inherit flag after we are done or xfs_repair + # will fail. + $XFS_IO_PROG -c 'chattr -t' $SCRATCH_MNT | tee -a $seqres.full 2>&1 +fi + + +rm -f $SCRATCH_MNT/testfile + +# success, all done +status=0 +exittests/xfs/431.out new file +3
-0@@ -0,0 +1,3 @@ +QA output created by 431 +wrote 1048576/1048576 bytes at offset 0 +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)tests/xfs/group +0
-0
tests/xfs/group line 430
Quoted 4 lines
tests/xfs/group +1
-0@@ -427,3 +427,4 @@ 428 dangerous_fuzzers dangerous_scrub dangerous_online_repair 429 dangerous_fuzzers dangerous_scrub dangerous_repair 430 dangerous_fuzzers dangerous_scrub dangerous_online_repair +431 quick
This ought to have 'dangerous' too, so that everyone knows that it can crash an unpatched kernel.
(After stable/distros have had a few weeks to fix this you could add it to the 'auto' group as well so that everyone will run it.)
--D
Quoted 7 lines
Signature · 6 lines
2.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 32 lines · Darrick J. Wong
Quoted 6 lines · Richard Wareing
Verify kernel doesn't panic when user attempts to set realtime flags on non-realtime FS, using kernel compiled with
CONFIG_XFS_RT. Unpatched kernels will panic during this test. Kernels not compiled withCONFIG_XFS_RTshould pass test.This bug was fixed via commit
b31ff3cdf540110da4572e3e29bd172087af65ccOooh, a commit id, nice! :)
Quoted 22 lines
on the main kernel tree.
Signed-off-by Richard Wareing <[email protected]>--- tests/xfs/431 | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/431.out | 3 ++ tests/xfs/group | 1 + 3 files changed, 90 insertions(+) create mode 100755 tests/xfs/431 create mode 100644 tests/xfs/431.outtests/xfs/431 new file +5
-0@@ -0,0 +1,86 @@ +#! /bin/bash +# FS QA Test 431 +# +# Verify kernel doesn't panic when user attempts to set realtime flags +# on non-realtime FS, using kernel compiled with CONFIG_XFS_RT.
Quoted 9 lines
tests/xfs/431 line 10
Quoted 6 lines
Unpatched
tests/xfs/431 new file +5
-0+# kernels will panic during this test. Kernels not compiled with +# CONFIG_XFS_RT should pass test. +# +#----------------------------------------------------------------------- +# Copyright (c) 2017 YOUR NAME HERE. All Rights Reserved.Mr. HERE, please update this line! :)
Fixed in v2.
Quoted 44 lines
Quoted 44 lines
tests/xfs/431 new file +44
-0+# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it would be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +#----------------------------------------------------------------------- +# + +seq=`basename $0` +seqres=$RESULT_DIR/$seq +echo "QA output created by $seq" + +here=`pwd` +tmp=/tmp/$$ +status=1 # failure is the default! +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_cleanup() +{ + cd / + rm -f $tmp.* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter + +# remove previous $seqres.full before test +rm -f $seqres.full + +# real QA test starts here + +# Modify as appropriate. +_supported_fs xfs +_supported_os Linux +_require_xfs_io_command "chattr"
Quoted 9 lines
tests/xfs/431 line 59
Quoted 5 lines
tests/xfs/431 new file +5
-0+_require_xfs_io_command "fsync" +_require_xfs_io_command "pwrite" +_require_scratch +_require_test +Shouldn't we unset USE_EXTERNAL/SCRATCH_RTDEV here since the bug only affects non-rt xfses?
I tried playing around with this, but wasn't able to get it to work. The best I think to do is create a "_require_no_realtime" and skip the test if it's being run under a realtime test run.
Quoted 49 lines
Quoted 41 lines
tests/xfs/431 new file +27
-0+_scratch_mkfs >/dev/null 2>&1 +_scratch_mount + +# Set realtime inherit flag on scratch mount, suppress output +# as this may simply error out on future kernels, we will check +# exit code instead. +$XFS_IO_PROG -c 'chattr +t' $SCRATCH_MNT &> /dev/null +chattr_ret=$? + +# Erroring out here is fine, this would be desired behavior for +# FSes without realtime devices present. +if (( chattr_ret == 0)); then + # Attempt to write/fsync data to file + $XFS_IO_PROG -fc 'pwrite 0 1m' -c fsync $SCRATCH_MNT/testfile | + tee -a $seqres.full | common_line_filter | _filter_xfs_io + + # Remove the rt inherit flag after we are done or xfs_repair + # will fail. + $XFS_IO_PROG -c 'chattr -t' $SCRATCH_MNT | tee -a $seqres.full 2>&1 +fi + + +rm -f $SCRATCH_MNT/testfile + +# success, all done +status=0 +exittests/xfs/431.out new file +3
-0@@ -0,0 +1,3 @@ +QA output created by 431 +wrote 1048576/1048576 bytes at offset 0 +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)tests/xfs/group +0
-0tests/xfs/group line 430
Quoted 4 lines
tests/xfs/group +1
-0@@ -427,3 +427,4 @@ 428 dangerous_fuzzers dangerous_scrub dangerous_online_repair 429 dangerous_fuzzers dangerous_scrub dangerous_repair 430 dangerous_fuzzers dangerous_scrub dangerous_online_repair +431 quickThis ought to have 'dangerous' too, so that everyone knows that it can crash an unpatched kernel.
Quoted 3 lines
(After stable/distros have had a few weeks to fix this you could add it to the 'auto' group as well so that everyone will run it.)
Fixed in v3.
Quoted 9 lines
--D
Quoted 7 lines
Signature · 6 lines
2.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 100 lines · Richard Wareing
Quoted 32 lines · Darrick J. Wong
Quoted 6 lines · Richard Wareing
Verify kernel doesn't panic when user attempts to set realtime flags on non-realtime FS, using kernel compiled with
CONFIG_XFS_RT. Unpatched kernels will panic during this test. Kernels not compiled withCONFIG_XFS_RTshould pass test.This bug was fixed via commit
b31ff3cdf540110da4572e3e29bd172087af65ccOooh, a commit id, nice! :)
Quoted 22 lines
on the main kernel tree.
Signed-off-by Richard Wareing <[email protected]>--- tests/xfs/431 | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/431.out | 3 ++ tests/xfs/group | 1 + 3 files changed, 90 insertions(+) create mode 100755 tests/xfs/431 create mode 100644 tests/xfs/431.outtests/xfs/431 new file +5
-0@@ -0,0 +1,86 @@ +#! /bin/bash +# FS QA Test 431 +# +# Verify kernel doesn't panic when user attempts to set realtime flags +# on non-realtime FS, using kernel compiled with CONFIG_XFS_RT.Quoted 9 lines
tests/xfs/431 line 10
Quoted 6 lines
Unpatched
tests/xfs/431 new file +5
-0+# kernels will panic during this test. Kernels not compiled with +# CONFIG_XFS_RT should pass test. +# +#----------------------------------------------------------------------- +# Copyright (c) 2017 YOUR NAME HERE. All Rights Reserved.Mr. HERE, please update this line! :)
Fixed in v2.
Quoted 44 lines
Quoted 44 lines
tests/xfs/431 new file +44
-0+# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it would be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +#----------------------------------------------------------------------- +# + +seq=`basename $0` +seqres=$RESULT_DIR/$seq +echo "QA output created by $seq" + +here=`pwd` +tmp=/tmp/$$ +status=1 # failure is the default! +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_cleanup() +{ + cd / + rm -f $tmp.* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter + +# remove previous $seqres.full before test +rm -f $seqres.full + +# real QA test starts here + +# Modify as appropriate. +_supported_fs xfs +_supported_os Linux +_require_xfs_io_command "chattr"Quoted 9 lines
tests/xfs/431 line 59
Quoted 5 lines
tests/xfs/431 new file +5
-0+_require_xfs_io_command "fsync" +_require_xfs_io_command "pwrite" +_require_scratch +_require_test +Shouldn't we unset USE_EXTERNAL/SCRATCH_RTDEV here since the bug only affects non-rt xfses?
Quoted 3 lines
I tried playing around with this, but wasn't able to get it to work. The best I think to do is create a "
_require_no_realtime" and skip the test if it's being run under a realtime test run.
Hmm, I don't think we need to exclude test with rtdev, it's true that the bug only affects non-rt XFS but there's no harm to do such a 'sanity' test with rtdev present.
Quoted 10 lines
Quoted 10 lines
tests/xfs/431 line 67
Quoted 10 lines
tests/xfs/431 new file +8
-0+_scratch_mkfs >/dev/null 2>&1 +_scratch_mount + +# Set realtime inherit flag on scratch mount, suppress output +# as this may simply error out on future kernels, we will check +# exit code instead. +$XFS_IO_PROG -c 'chattr +t' $SCRATCH_MNT &> /dev/null +chattr_ret=$?
It seems that xfs_io always returns 0 even the command fails, e.g.
[root@bootp-73-5-205 xfstests]# xfs_io -c "pwrite 0 4k" /
pwrite: Bad file descriptor
[root@bootp-73-5-205 xfstests]# echo $?
0
So we should not depend on xfs_io's return value. And I think doing the 'pwrite' & 'fsync' test unconditionally should be fine, e.g.
$XFS_IO_PROG -c 'chattr +t' $SCRATCH_MNT >>$seqres.full 2>&1 $XFS_IO_PROG -fc 'pwrite 0 1m' -c fsync .. $XFS_IO_PROG -c 'chattr -t' $SCRATCH_MNT...
I tested on 4.14-rc1 kernels with and without CONFIG_XFS_RT, and with and without rtdev present when CONFIG_XFS_RT=y, all tests passed.
Quoted 7 lines
Quoted 7 lines
tests/xfs/431 line 74
Quoted 7 lines
tests/xfs/431 new file +7
-0+ +# Erroring out here is fine, this would be desired behavior for +# FSes without realtime devices present. +if (( chattr_ret == 0)); then + # Attempt to write/fsync data to file + $XFS_IO_PROG -fc 'pwrite 0 1m' -c fsync $SCRATCH_MNT/testfile | + tee -a $seqres.full | common_line_filter | _filter_xfs_io
(common_line_filter | _filter_xfs_io) == _filter_xfs_io_unique
But I think a bare _filter_xfs_io should just work, there's no common lines to be filtered anyway.
Quoted 4 lines
Quoted 4 lines
tests/xfs/431 line 78
Quoted 4 lines
tests/xfs/431 new file +4
-0+ + # Remove the rt inherit flag after we are done or xfs_repair + # will fail. + $XFS_IO_PROG -c 'chattr -t' $SCRATCH_MNT | tee -a $seqres.full 2>&1
And please use real tab as indention :)
Quoted 30 lines
Quoted 30 lines
Quoted 22 lines
tests/xfs/431 new file +8
-0+fi + + +rm -f $SCRATCH_MNT/testfile + +# success, all done +status=0 +exittests/xfs/431.out new file +3
-0@@ -0,0 +1,3 @@ +QA output created by 431 +wrote 1048576/1048576 bytes at offset 0 +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)tests/xfs/group +0
-0tests/xfs/group line 430
Quoted 4 lines
tests/xfs/group +1
-0@@ -427,3 +427,4 @@ 428 dangerous_fuzzers dangerous_scrub dangerous_online_repair 429 dangerous_fuzzers dangerous_scrub dangerous_repair 430 dangerous_fuzzers dangerous_scrub dangerous_online_repair +431 quickThis ought to have 'dangerous' too, so that everyone knows that it can crash an unpatched kernel.
Quoted 2 lines
Quoted 2 lines
(After stable/distros have had a few weeks to fix this you could add it to the 'auto' group as well so that everyone will run it.)
'quick' is just a subset of 'auto', all 'quick' tests should be in 'auto' group too, the only difference is 'quick' is quick :) usually run time is less than 30s. If you want to exclude tests in 'dangerous' group you can run check with '-x dangerous' option.
Thanks,
Eryu
Quoted 19 lines
Quoted 1 line
Fixed in v3.
Quoted 9 lines
--D
Quoted 7 lines
Signature · 6 lines
2.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html--
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 99 lines · Eryu Guan
Quoted 98 lines · Richard Wareing
Quoted 32 lines · Darrick J. Wong
Quoted 6 lines · Richard Wareing
Verify kernel doesn't panic when user attempts to set realtime flags on non-realtime FS, using kernel compiled with
CONFIG_XFS_RT. Unpatched kernels will panic during this test. Kernels not compiled withCONFIG_XFS_RTshould pass test.This bug was fixed via commit
b31ff3cdf540110da4572e3e29bd172087af65ccOooh, a commit id, nice! :)
Quoted 22 lines
on the main kernel tree.
Signed-off-by Richard Wareing <[email protected]>--- tests/xfs/431 | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/431.out | 3 ++ tests/xfs/group | 1 + 3 files changed, 90 insertions(+) create mode 100755 tests/xfs/431 create mode 100644 tests/xfs/431.outtests/xfs/431 new file +5
-0@@ -0,0 +1,86 @@ +#! /bin/bash +# FS QA Test 431 +# +# Verify kernel doesn't panic when user attempts to set realtime flags +# on non-realtime FS, using kernel compiled with CONFIG_XFS_RT.Quoted 8 lines
tests/xfs/431 line 10
Quoted 6 lines
Unpatched
tests/xfs/431 new file +5
-0+# kernels will panic during this test. Kernels not compiled with +# CONFIG_XFS_RT should pass test. +# +#----------------------------------------------------------------------- +# Copyright (c) 2017 YOUR NAME HERE. All Rights Reserved.Mr. HERE, please update this line! :)
Fixed in v2.
Quoted 52 lines
Quoted 39 lines
tests/xfs/431 new file +39
-0+# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it would be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +#----------------------------------------------------------------------- +# + +seq=`basename $0` +seqres=$RESULT_DIR/$seq +echo "QA output created by $seq" + +here=`pwd` +tmp=/tmp/$$ +status=1 # failure is the default! +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_cleanup() +{ + cd / + rm -f $tmp.* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter + +# remove previous $seqres.full before test +rm -f $seqres.full + +# real QA test starts heretests/xfs/431 line 59
Quoted 10 lines
tests/xfs/431 new file +10
-0+ +# Modify as appropriate. +_supported_fs xfs +_supported_os Linux +_require_xfs_io_command "chattr" +_require_xfs_io_command "fsync" +_require_xfs_io_command "pwrite" +_require_scratch +_require_test +Shouldn't we unset USE_EXTERNAL/SCRATCH_RTDEV here since the bug only affects non-rt xfses?
Quoted 8 lines
Quoted 3 lines
I tried playing around with this, but wasn't able to get it to work. The best I think to do is create a "
_require_no_realtime" and skip the test if it's being run under a realtime test run.Hmm, I don't think we need to exclude test with rtdev, it's true that the bug only affects non-rt XFS but there's no harm to do such a 'sanity' test with rtdev present.
Sounds fine to me, there's no reason this should ever fail on a FS with a realtime device. If it did, there's something horribly wrong.
Quoted 16 lines
Quoted 8 lines
Quoted 8 lines
tests/xfs/431 line 67
Quoted 8 lines
tests/xfs/431 new file +8
-0+_scratch_mkfs >/dev/null 2>&1 +_scratch_mount + +# Set realtime inherit flag on scratch mount, suppress output +# as this may simply error out on future kernels, we will check +# exit code instead. +$XFS_IO_PROG -c 'chattr +t' $SCRATCH_MNT &> /dev/null +chattr_ret=$?It seems that
xfs_ioalways returns 0 even the command fails, e.g.[root@bootp-73-5-205 xfstests]#
xfs_io-c "pwrite 0 4k" /
pwrite: Bad file descriptor
[root@bootp-73-5-205 xfstests]# echo $?
0
Quoted 7 lines
So we should not depend on xfs_io's return value. And I think doing the 'pwrite' & 'fsync' test unconditionally should be fine, e.g.
$XFS_IO_PROG -c 'chattr +t' $SCRATCH_MNT >>$seqres.full 2>&1 $XFS_IO_PROG -fc 'pwrite 0 1m' -c fsync .. $XFS_IO_PROG -c 'chattr -t' $SCRATCH_MNT...
xfs_io in other cases exit with non-zero (e.g. ENOENT errors), I've got another patch will will eventually deny setting the inherit flag on an FS without an rtdev configured, so I'd rather handle this case now then fix it later (or worse, forget to fix it).
Quoted 3 lines
I tested on 4.14-rc1 kernels with and without
CONFIG_XFS_RT, and with and without rtdev present whenCONFIG_XFS_RT=y, all tests passed.
This kernel passes as it has commit b31ff3cdf540110da4572e3e29bd172087af65cc :). Revert this commit and try again to see things explode. i.e. The fact it passes, is indication the kernel is fixed.
Quoted 10 lines
Quoted 7 lines
Quoted 7 lines
tests/xfs/431 line 74
Quoted 7 lines
tests/xfs/431 new file +7
-0+ +# Erroring out here is fine, this would be desired behavior for +# FSes without realtime devices present. +if (( chattr_ret == 0)); then + # Attempt to write/fsync data to file + $XFS_IO_PROG -fc 'pwrite 0 1m' -c fsync $SCRATCH_MNT/testfile | + tee -a $seqres.full | common_line_filter | _filter_xfs_io(
common_line_filter|_filter_xfs_io) ==_filter_xfs_io_unique
Quoted 3 lines
But I think a bare
_filter_xfs_ioshould just work, there's no common lines to be filtered anyway.
Fixed.
Quoted 7 lines
Quoted 4 lines
Quoted 4 lines
tests/xfs/431 line 78
Quoted 4 lines
tests/xfs/431 new file +4
-0+ + # Remove the rt inherit flag after we are done or xfs_repair + # will fail. + $XFS_IO_PROG -c 'chattr -t' $SCRATCH_MNT | tee -a $seqres.full 2>&1And please use real tab as indention :)
Oops! We use spaces around here so I always have a hard time keeping it straight depending on the repo I'm in. I'll fix this.
Quoted 30 lines
Quoted 30 lines
Quoted 30 lines
Quoted 22 lines
tests/xfs/431 new file +8
-0+fi + + +rm -f $SCRATCH_MNT/testfile + +# success, all done +status=0 +exittests/xfs/431.out new file +3
-0@@ -0,0 +1,3 @@ +QA output created by 431 +wrote 1048576/1048576 bytes at offset 0 +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)tests/xfs/group +0
-0tests/xfs/group line 430
Quoted 4 lines
tests/xfs/group +1
-0@@ -427,3 +427,4 @@ 428 dangerous_fuzzers dangerous_scrub dangerous_online_repair 429 dangerous_fuzzers dangerous_scrub dangerous_repair 430 dangerous_fuzzers dangerous_scrub dangerous_online_repair +431 quickThis ought to have 'dangerous' too, so that everyone knows that it can crash an unpatched kernel.
Quoted 8 lines
Quoted 2 lines
Quoted 2 lines
(After stable/distros have had a few weeks to fix this you could add it to the 'auto' group as well so that everyone will run it.)
'quick' is just a subset of 'auto', all 'quick' tests should be in 'auto' group too, the only difference is 'quick' is quick :) usually run time is less than 30s. If you want to exclude tests in 'dangerous' group you can run check with '-x dangerous' option.
Fixing.
Quoted 20 lines
Thanks,
EryuQuoted 17 lines
Fixed in v3.
Quoted 9 lines
--D
Quoted 7 lines
Signature · 6 lines
2.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html--
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 99 lines · Eryu Guan
Quoted 98 lines · Richard Wareing
Quoted 32 lines · Darrick J. Wong
Quoted 6 lines · Richard Wareing
Verify kernel doesn't panic when user attempts to set realtime flags on non-realtime FS, using kernel compiled with
CONFIG_XFS_RT. Unpatched kernels will panic during this test. Kernels not compiled withCONFIG_XFS_RTshould pass test.This bug was fixed via commit
b31ff3cdf540110da4572e3e29bd172087af65ccOooh, a commit id, nice! :)
Quoted 22 lines
on the main kernel tree.
Signed-off-by Richard Wareing <[email protected]>--- tests/xfs/431 | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/431.out | 3 ++ tests/xfs/group | 1 + 3 files changed, 90 insertions(+) create mode 100755 tests/xfs/431 create mode 100644 tests/xfs/431.outtests/xfs/431 new file +5
-0@@ -0,0 +1,86 @@ +#! /bin/bash +# FS QA Test 431 +# +# Verify kernel doesn't panic when user attempts to set realtime flags +# on non-realtime FS, using kernel compiled with CONFIG_XFS_RT.Quoted 8 lines
tests/xfs/431 line 10
Quoted 6 lines
Unpatched
tests/xfs/431 new file +5
-0+# kernels will panic during this test. Kernels not compiled with +# CONFIG_XFS_RT should pass test. +# +#----------------------------------------------------------------------- +# Copyright (c) 2017 YOUR NAME HERE. All Rights Reserved.Mr. HERE, please update this line! :)
Fixed in v2.
Quoted 52 lines
Quoted 39 lines
tests/xfs/431 new file +39
-0+# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it would be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +#----------------------------------------------------------------------- +# + +seq=`basename $0` +seqres=$RESULT_DIR/$seq +echo "QA output created by $seq" + +here=`pwd` +tmp=/tmp/$$ +status=1 # failure is the default! +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_cleanup() +{ + cd / + rm -f $tmp.* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter + +# remove previous $seqres.full before test +rm -f $seqres.full + +# real QA test starts heretests/xfs/431 line 59
Quoted 10 lines
tests/xfs/431 new file +10
-0+ +# Modify as appropriate. +_supported_fs xfs +_supported_os Linux +_require_xfs_io_command "chattr" +_require_xfs_io_command "fsync" +_require_xfs_io_command "pwrite" +_require_scratch +_require_test +Shouldn't we unset USE_EXTERNAL/SCRATCH_RTDEV here since the bug only affects non-rt xfses?
Quoted 8 lines
Quoted 3 lines
I tried playing around with this, but wasn't able to get it to work. The best I think to do is create a "
_require_no_realtime" and skip the test if it's being run under a realtime test run.Hmm, I don't think we need to exclude test with rtdev, it's true that the bug only affects non-rt XFS but there's no harm to do such a 'sanity' test with rtdev present.
Sounds fine to me, there's no reason this should ever fail on a FS with a realtime device. If it did, there's something horribly wrong.
Quoted 16 lines
Quoted 8 lines
Quoted 8 lines
tests/xfs/431 line 67
Quoted 8 lines
tests/xfs/431 new file +8
-0+_scratch_mkfs >/dev/null 2>&1 +_scratch_mount + +# Set realtime inherit flag on scratch mount, suppress output +# as this may simply error out on future kernels, we will check +# exit code instead. +$XFS_IO_PROG -c 'chattr +t' $SCRATCH_MNT &> /dev/null +chattr_ret=$?It seems that
xfs_ioalways returns 0 even the command fails, e.g.[root@bootp-73-5-205 xfstests]#
xfs_io-c "pwrite 0 4k" /
pwrite: Bad file descriptor
[root@bootp-73-5-205 xfstests]# echo $?
0
Quoted 7 lines
So we should not depend on xfs_io's return value. And I think doing the 'pwrite' & 'fsync' test unconditionally should be fine, e.g.
$XFS_IO_PROG -c 'chattr +t' $SCRATCH_MNT >>$seqres.full 2>&1 $XFS_IO_PROG -fc 'pwrite 0 1m' -c fsync .. $XFS_IO_PROG -c 'chattr -t' $SCRATCH_MNT...
xfs_io in other cases exit with non-zero (e.g. ENOENT errors), I've got another patch will will eventually deny setting the inherit flag on an FS without an rtdev configured, so I'd rather handle this case now then fix it later (or worse, forget to fix it).
Quoted 3 lines
I tested on 4.14-rc1 kernels with and without
CONFIG_XFS_RT, and with and without rtdev present whenCONFIG_XFS_RT=y, all tests passed.
This kernel passes as it has commit b31ff3cdf540110da4572e3e29bd172087af65cc :). Revert this commit and try again to see things explode. i.e. The fact it passes, is indication the kernel is fixed.
Quoted 10 lines
Quoted 7 lines
Quoted 7 lines
tests/xfs/431 line 74
Quoted 7 lines
tests/xfs/431 new file +7
-0+ +# Erroring out here is fine, this would be desired behavior for +# FSes without realtime devices present. +if (( chattr_ret == 0)); then + # Attempt to write/fsync data to file + $XFS_IO_PROG -fc 'pwrite 0 1m' -c fsync $SCRATCH_MNT/testfile | + tee -a $seqres.full | common_line_filter | _filter_xfs_io(
common_line_filter|_filter_xfs_io) ==_filter_xfs_io_unique
Quoted 3 lines
But I think a bare
_filter_xfs_ioshould just work, there's no common lines to be filtered anyway.
Fixed.
Quoted 7 lines
Quoted 4 lines
Quoted 4 lines
tests/xfs/431 line 78
Quoted 4 lines
tests/xfs/431 new file +4
-0+ + # Remove the rt inherit flag after we are done or xfs_repair + # will fail. + $XFS_IO_PROG -c 'chattr -t' $SCRATCH_MNT | tee -a $seqres.full 2>&1And please use real tab as indention :)
Oops! We use spaces around here so I always have a hard time keeping it straight depending on the repo I'm in. I'll fix this.
Quoted 30 lines
Quoted 30 lines
Quoted 30 lines
Quoted 22 lines
tests/xfs/431 new file +8
-0+fi + + +rm -f $SCRATCH_MNT/testfile + +# success, all done +status=0 +exittests/xfs/431.out new file +3
-0@@ -0,0 +1,3 @@ +QA output created by 431 +wrote 1048576/1048576 bytes at offset 0 +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)tests/xfs/group +0
-0tests/xfs/group line 430
Quoted 4 lines
tests/xfs/group +1
-0@@ -427,3 +427,4 @@ 428 dangerous_fuzzers dangerous_scrub dangerous_online_repair 429 dangerous_fuzzers dangerous_scrub dangerous_repair 430 dangerous_fuzzers dangerous_scrub dangerous_online_repair +431 quickThis ought to have 'dangerous' too, so that everyone knows that it can crash an unpatched kernel.
Quoted 8 lines
Quoted 2 lines
Quoted 2 lines
(After stable/distros have had a few weeks to fix this you could add it to the 'auto' group as well so that everyone will run it.)
'quick' is just a subset of 'auto', all 'quick' tests should be in 'auto' group too, the only difference is 'quick' is quick :) usually run time is less than 30s. If you want to exclude tests in 'dangerous' group you can run check with '-x dangerous' option.
Fixing.
Quoted 20 lines
Thanks,
EryuQuoted 17 lines
Fixed in v3.
Quoted 9 lines
--D
Quoted 7 lines
Signature · 6 lines
2.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html--
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html