xfs: add test for CVE-2020-12655
authorGao Xiang <hsiangkao@redhat.com>
Wed, 24 Jun 2020 01:06:30 +0000 (09:06 +0800)
committerEryu Guan <guaneryu@gmail.com>
Sun, 19 Jul 2020 16:47:56 +0000 (00:47 +0800)
Add a regression test to see if kernel hangs in order to
look after CVE-2020-12655 and check if the corresponding
fix is applied as well.

Signed-off-by: Gao Xiang <hsiangkao@redhat.com>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
tests/xfs/520 [new file with mode: 0755]
tests/xfs/520.out [new file with mode: 0644]
tests/xfs/group

diff --git a/tests/xfs/520 b/tests/xfs/520
new file mode 100755 (executable)
index 0000000..bdc05f7
--- /dev/null
@@ -0,0 +1,86 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2020 Red Hat, Inc.  All Rights Reserved.
+#
+# FS QA Test 520
+#
+# Verify kernel doesn't hang when mounting a crafted image
+# with bad agf.freeblks metadata due to CVE-2020-12655.
+#
+# Also, check if
+# commit d0c7feaf8767 ("xfs: add agf freeblocks verify in xfs_agf_verify")
+# is included in the current kernel.
+#
+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.*
+       _scratch_unmount > /dev/null 2>&1
+}
+
+# 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
+
+_supported_fs xfs
+_supported_os Linux
+_disable_dmesg_check
+_require_check_dmesg
+_require_scratch_nocheck
+
+force_crafted_metadata() {
+       _scratch_mkfs_xfs -f $fsdsopt "$4" >> $seqres.full 2>&1 || _fail "mkfs failed"
+       _scratch_xfs_set_metadata_field "$1" "$2" "$3" >> $seqres.full 2>&1
+       local kmsg="xfs/$seq: testing $1=$2 at $(date +"%F %T")"
+       local mounted=0
+       local hasmsg=0
+
+       echo "${kmsg}" > /dev/kmsg
+       _try_scratch_mount >> $seqres.full 2>&1 && mounted=1
+
+       if [ $mounted -ne 0 ]; then
+               dd if=/dev/zero of=$SCRATCH_MNT/test bs=65536 count=1 >> \
+                       $seqres.full 2>&1
+               sync
+       fi
+
+       _dmesg_since_test_start | tac | sed -ne "0,\#${kmsg}#p" | tac | \
+               egrep -q 'Metadata corruption detected at' && hasmsg=1
+
+       _scratch_unmount > /dev/null 2>&1
+       [ $mounted -eq 0 -o $hasmsg -eq 1 ] || \
+               _fail "potential broken kernel (mounted=${mounted},hasmsg=${hasmsg})"
+}
+
+bigval=100000000
+fsdsopt="-d agcount=1,size=64m"
+
+force_crafted_metadata freeblks 0 "agf 0"
+force_crafted_metadata longest $bigval "agf 0"
+force_crafted_metadata length $bigval "agf 0"
+
+_scratch_mkfs_xfs_supported -m reflink=1 >> $seqres.full 2>&1 && \
+       force_crafted_metadata refcntblocks $bigval "agf 0" "-m reflink=1"
+
+_scratch_mkfs_xfs_supported -m rmapbt=1 >> $seqres.full 2>&1 && \
+       force_crafted_metadata rmapblocks $bigval "agf 0" "-m rmapbt=1"
+
+echo "Silence is golden"
+
+# success, all done
+status=0
+exit
diff --git a/tests/xfs/520.out b/tests/xfs/520.out
new file mode 100644 (file)
index 0000000..2a59b87
--- /dev/null
@@ -0,0 +1,2 @@
+QA output created by 520
+Silence is golden
index daf54add29da7dd296f5054e53c8b0eb85b5465e..d6e8d1c3d5e929cd68488bde647337a9f8ac07b0 100644 (file)
 517 auto quick fsmap freeze
 518 auto quick quota
 519 auto quick reflink
 517 auto quick fsmap freeze
 518 auto quick quota
 519 auto quick reflink
+520 auto quick reflink