xfs/ext4: check negative inode size

Craft a malicious filesystem image with a negative inode size,
then try to trigger a kernel DoS by appending data to the file.
Ideally this should trigger verifier errors instead of hanging.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
This commit is contained in:
Darrick J. Wong
2017-01-09 12:55:18 -08:00
committed by Eryu Guan
parent 959f80ec24
commit 466369dc92
10 changed files with 328 additions and 0 deletions
+75
View File
@@ -0,0 +1,75 @@
#! /bin/bash
# FSQA Test No. 400
#
# Since loff_t is a signed type, it is invalid for a filesystem to load
# an inode with i_size = -1ULL. Unfortunately, nobody checks this,
# which means that we can trivially DoS the VFS by creating such a file
# and appending to it. This causes an integer overflow in the routines
# underlying writeback, which results in the kernel locking up.
#
# So, create this malformed inode and try a buffered append to make
# sure we catch this situation.
#
#-----------------------------------------------------------------------
# Copyright (c) 2017 Oracle, Inc. 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"
PIDS=""
tmp=/tmp/$$
status=1 # failure is the default!
trap "_cleanup; exit \$status" 0 1 2 3 15
_cleanup()
{
rm -f $tmp.*
}
# get standard environment, filters and checks
. ./common/rc
. ./common/filter
# real QA test starts here
_supported_os Linux
_supported_fs ext2 ext3 ext4
_require_scratch_nocheck
_disable_dmesg_check
_require_command "$DEBUGFS_PROG"
rm -f $seqres.full
echo "Format and mount"
_scratch_mkfs >> $seqres.full 2>&1
_scratch_mount
testdir=$SCRATCH_MNT
echo m > $testdir/a
echo "Corrupt filesystem"
_scratch_unmount
$DEBUGFS_PROG -w -R "sif /a size -1" $SCRATCH_DEV >> $seqres.full 2>&1
echo "Remount, try to append"
_scratch_mount
dd if=/dev/zero of=$testdir/a bs=512 count=1 oflag=append conv=notrunc >> $seqres.full 2>&1 || echo "Write did not succeed (ok)."
sync
# success, all done
status=0
exit
+5
View File
@@ -0,0 +1,5 @@
QA output created by 005
Format and mount
Corrupt filesystem
Remount, try to append
Write did not succeed (ok).
+77
View File
@@ -0,0 +1,77 @@
#! /bin/bash
# FSQA Test No. 401
#
# Since loff_t is a signed type, it is invalid for a filesystem to load
# an inode with i_size = -1ULL. Unfortunately, nobody checks this,
# which means that we can trivially DoS the VFS by creating such a file
# and appending to it. This causes an integer overflow in the routines
# underlying writeback, which results in the kernel locking up.
#
# So, create this malformed inode and try a dio append to make sure we
# catch this situation.
#
#-----------------------------------------------------------------------
# Copyright (c) 2017 Oracle, Inc. 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"
PIDS=""
tmp=/tmp/$$
status=1 # failure is the default!
trap "_cleanup; exit \$status" 0 1 2 3 15
_cleanup()
{
rm -f $tmp.*
}
# get standard environment, filters and checks
. ./common/rc
. ./common/filter
# real QA test starts here
_supported_os Linux
_supported_fs ext2 ext3 ext4
_require_scratch_nocheck
_disable_dmesg_check
_require_command "$DEBUGFS_PROG"
rm -f $seqres.full
echo "Format and mount"
_scratch_mkfs >> $seqres.full 2>&1
_scratch_mount
testdir=$SCRATCH_MNT
echo m > $testdir/a
echo "Corrupt filesystem"
_scratch_unmount
# Set the file size to the highest multiple of 512 below
# -1 so that we can perform a dio write.
$DEBUGFS_PROG -w -R "sif /a size 0xFFFFFFFFFFFFFE00" $SCRATCH_DEV >> $seqres.full 2>&1
echo "Remount, try to append"
_scratch_mount
dd if=/dev/zero of=$testdir/a bs=512 count=1 oflag=direct,append conv=notrunc >> $seqres.full 2>&1 || echo "Write did not succeed (ok)."
sync
# success, all done
status=0
exit
+5
View File
@@ -0,0 +1,5 @@
QA output created by 007
Format and mount
Corrupt filesystem
Remount, try to append
Write did not succeed (ok).
+2
View File
@@ -7,7 +7,9 @@
002 auto metadata quick 002 auto metadata quick
003 auto quick 003 auto quick
004 auto quick 004 auto quick
005 dangerous_fuzzers
006 auto enospc 006 auto enospc
007 dangerous_fuzzers
032 mkfs auto quick 032 mkfs auto quick
051 acl udf auto quick 051 acl udf auto quick
272 auto enospc rw 272 auto enospc rw
Executable
+75
View File
@@ -0,0 +1,75 @@
#! /bin/bash
# FSQA Test No. 400
#
# Since loff_t is a signed type, it is invalid for a filesystem to load
# an inode with i_size = -1ULL. Unfortunately, nobody checks this,
# which means that we can trivially DoS the VFS by creating such a file
# and appending to it. This causes an integer overflow in the routines
# underlying writeback, which results in the kernel locking up.
#
# So, create this malformed inode and try a buffered append to make
# sure we catch this situation.
#
#-----------------------------------------------------------------------
# Copyright (c) 2017 Oracle, Inc. 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"
PIDS=""
tmp=/tmp/$$
status=1 # failure is the default!
trap "_cleanup; exit \$status" 0 1 2 3 15
_cleanup()
{
rm -f $tmp.*
}
# get standard environment, filters and checks
. ./common/rc
. ./common/filter
# real QA test starts here
_supported_os Linux
_supported_fs xfs
_require_scratch_nocheck
_disable_dmesg_check
rm -f $seqres.full
echo "Format and mount"
_scratch_mkfs >> $seqres.full 2>&1
_scratch_mount
testdir=$SCRATCH_MNT
echo m > $testdir/a
inum=$(stat -c "%i" $testdir/a)
echo "Corrupt filesystem"
_scratch_unmount
_scratch_xfs_db -x -c "inode ${inum}" -c 'write core.size -- -1' >> $seqres.full
echo "Remount, try to append"
_scratch_mount
dd if=/dev/zero of=$testdir/a bs=512 count=1 oflag=append conv=notrunc >> $seqres.full 2>&1 || echo "Write did not succeed (ok)."
sync
# success, all done
status=0
exit
+5
View File
@@ -0,0 +1,5 @@
QA output created by 133
Format and mount
Corrupt filesystem
Remount, try to append
Write did not succeed (ok).
Executable
+77
View File
@@ -0,0 +1,77 @@
#! /bin/bash
# FSQA Test No. 401
#
# Since loff_t is a signed type, it is invalid for a filesystem to load
# an inode with i_size = -1ULL. Unfortunately, nobody checks this,
# which means that we can trivially DoS the VFS by creating such a file
# and appending to it. This causes an integer overflow in the routines
# underlying writeback, which results in the kernel locking up.
#
# So, create this malformed inode and try a dio append to make sure we
# catch this situation.
#
#-----------------------------------------------------------------------
# Copyright (c) 2017 Oracle, Inc. 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"
PIDS=""
tmp=/tmp/$$
status=1 # failure is the default!
trap "_cleanup; exit \$status" 0 1 2 3 15
_cleanup()
{
rm -f $tmp.*
}
# get standard environment, filters and checks
. ./common/rc
. ./common/filter
# real QA test starts here
_supported_os Linux
_supported_fs xfs
_require_scratch_nocheck
_disable_dmesg_check
rm -f $seqres.full
echo "Format and mount"
_scratch_mkfs >> $seqres.full 2>&1
_scratch_mount
testdir=$SCRATCH_MNT
echo m > $testdir/a
inum=$(stat -c "%i" $testdir/a)
echo "Corrupt filesystem"
_scratch_unmount
# Set the file size to the highest multiple of 512 below
# -1 so that we can perform a dio write.
_scratch_xfs_db -x -c "inode ${inum}" -c 'write core.size -- -512' >> $seqres.full
echo "Remount, try to append"
_scratch_mount
dd if=/dev/zero of=$testdir/a bs=512 count=1 oflag=direct,append conv=notrunc >> $seqres.full 2>&1 || echo "Write did not succeed (ok)."
sync
# success, all done
status=0
exit
+5
View File
@@ -0,0 +1,5 @@
QA output created by 134
Format and mount
Corrupt filesystem
Remount, try to append
Write did not succeed (ok).
+2
View File
@@ -130,6 +130,8 @@
130 fuzzers clone 130 fuzzers clone
131 auto quick clone 131 auto quick clone
132 auto quick clone 132 auto quick clone
133 dangerous_fuzzers
134 dangerous_fuzzers
135 auto logprint quick v2log 135 auto logprint quick v2log
136 attr2 136 attr2
137 auto metadata v2log 137 auto metadata v2log