aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrick J. Wong <djwong@kernel.org>2022-04-11 15:55:08 -0700
committerEryu Guan <guaneryu@gmail.com>2022-04-17 22:20:02 +0800
commit82047ce7cd46e3a89eaddb6e43e8c10416409cd9 (patch)
treef3b1bcb54eef5760245339334f5bb2322c7318b9
parent86e537edb41d9fbda0d6a18a8a30fc5c3f49d886 (diff)
downloadxfstests-dev-82047ce7cd46e3a89eaddb6e43e8c10416409cd9.tar.gz
xfs: test mkfs.xfs config file stack corruption issues
Add a new regression test for a stack corruption problem uncovered in the mkfs config file parsing code. Signed-off-by: Darrick J. Wong <djwong@kernel.org> Reviewed-by: Zorro Lang <zlang@redhat.com> Signed-off-by: Eryu Guan <guaneryu@gmail.com>
-rwxr-xr-xtests/xfs/54368
-rw-r--r--tests/xfs/543.out2
2 files changed, 70 insertions, 0 deletions
diff --git a/tests/xfs/543 b/tests/xfs/543
new file mode 100755
index 0000000000..913276c8e0
--- /dev/null
+++ b/tests/xfs/543
@@ -0,0 +1,68 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2022 Oracle. All Rights Reserved.
+#
+# FS QA Test No. 543
+#
+# Regression test for xfsprogs commit:
+#
+# 99c78777 ("mkfs: prevent corruption of passed-in suboption string values")
+#
+. ./common/preamble
+_begin_fstest auto quick mkfs
+
+_cleanup()
+{
+ rm -f $TEST_DIR/fubar.img
+ cd /
+ rm -r -f $tmp.*
+}
+
+# Import common functions.
+# . ./common/filter
+
+# real QA test starts here
+
+# Modify as appropriate.
+_supported_fs xfs
+_require_test
+_require_xfs_mkfs_cfgfile
+
+# Set up a configuration file with an exact block size and log stripe unit
+# so that mkfs won't complain about having to correct the log stripe unit
+# size that is implied by the provided data device stripe unit.
+cfgfile=$tmp.cfg
+cat << EOF >> $tmp.cfg
+[block]
+size=4096
+
+[data]
+su=2097152
+sw=1
+EOF
+
+# Some mkfs options store the user's value string for processing after certain
+# geometry parameters (e.g. the fs block size) have been settled. This is how
+# the su= option can accept arguments such as "8b" to mean eight filesystem
+# blocks.
+#
+# Unfortunately, on Ubuntu 20.04, the libini parser uses an onstack char[]
+# array to store value that it parse, and it passes the address of this array
+# to the parse_cfgopt. The getstr function returns its argument, which is
+# stored in the cli_params structure by the D_SU parsing code. By the time we
+# get around to interpreting this string, of course, the stack array has long
+# since lost scope and is now full of garbage. If we're lucky, the value will
+# cause a number interpretation failure. If not, the fs is configured with
+# garbage geometry.
+#
+# Either way, set up a config file to exploit this vulnerability so that we
+# can prove that current mkfs works correctly.
+$XFS_IO_PROG -f -c "truncate 1g" $TEST_DIR/fubar.img
+options=(-c options=$cfgfile -l sunit=8 -f -N $TEST_DIR/fubar.img)
+$MKFS_XFS_PROG "${options[@]}" >> $seqres.full ||
+ echo "mkfs failed"
+
+# success, all done
+echo Silence is golden
+status=0
+exit
diff --git a/tests/xfs/543.out b/tests/xfs/543.out
new file mode 100644
index 0000000000..c81361ed16
--- /dev/null
+++ b/tests/xfs/543.out
@@ -0,0 +1,2 @@
+QA output created by 543
+Silence is golden