42d43d35d9
cloop stores the number of compressed blocks in the n_blocks header
field. The file actually contains n_blocks + 1 offsets, where the extra
offset is the end-of-file offset.
The following line in cloop_read_block() results in an out-of-bounds
offsets[] access:
uint32_t bytes = s->offsets[block_num + 1] - s->offsets[block_num];
This patch allocates and loads the extra offset so that
cloop_read_block() works correctly when the last block is accessed.
Notice that we must free s->offsets[] unconditionally now since there is
always an end-of-file offset.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
107 lines
3.3 KiB
Bash
Executable File
107 lines
3.3 KiB
Bash
Executable File
#!/bin/bash
|
|
#
|
|
# cloop format input validation tests
|
|
#
|
|
# Copyright (C) 2013 Red Hat, Inc.
|
|
#
|
|
# 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; either version 2 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will 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, see <http://www.gnu.org/licenses/>.
|
|
#
|
|
|
|
# creator
|
|
owner=stefanha@redhat.com
|
|
|
|
seq=`basename $0`
|
|
echo "QA output created by $seq"
|
|
|
|
here=`pwd`
|
|
tmp=/tmp/$$
|
|
status=1 # failure is the default!
|
|
|
|
_cleanup()
|
|
{
|
|
_cleanup_test_img
|
|
}
|
|
trap "_cleanup; exit \$status" 0 1 2 3 15
|
|
|
|
# get standard environment, filters and checks
|
|
. ./common.rc
|
|
. ./common.filter
|
|
|
|
_supported_fmt cloop
|
|
_supported_proto generic
|
|
_supported_os Linux
|
|
|
|
block_size_offset=128
|
|
n_blocks_offset=132
|
|
offsets_offset=136
|
|
|
|
echo
|
|
echo "== check that the first sector can be read =="
|
|
_use_sample_img simple-pattern.cloop.bz2
|
|
$QEMU_IO -c "read 0 512" $TEST_IMG 2>&1 | _filter_qemu_io | _filter_testdir
|
|
|
|
echo
|
|
echo "== check that the last sector can be read =="
|
|
_use_sample_img simple-pattern.cloop.bz2
|
|
$QEMU_IO -c "read $((1024 * 1024 - 512)) 512" $TEST_IMG 2>&1 | _filter_qemu_io | _filter_testdir
|
|
|
|
echo
|
|
echo "== block_size must be a multiple of 512 =="
|
|
_use_sample_img simple-pattern.cloop.bz2
|
|
poke_file "$TEST_IMG" "$block_size_offset" "\x00\x00\x02\x01"
|
|
$QEMU_IO -c "read 0 512" $TEST_IMG 2>&1 | _filter_qemu_io | _filter_testdir
|
|
|
|
echo
|
|
echo "== block_size cannot be zero =="
|
|
_use_sample_img simple-pattern.cloop.bz2
|
|
poke_file "$TEST_IMG" "$block_size_offset" "\x00\x00\x00\x00"
|
|
$QEMU_IO -c "read 0 512" $TEST_IMG 2>&1 | _filter_qemu_io | _filter_testdir
|
|
|
|
echo
|
|
echo "== huge block_size ==="
|
|
_use_sample_img simple-pattern.cloop.bz2
|
|
poke_file "$TEST_IMG" "$block_size_offset" "\xff\xff\xfe\x00"
|
|
$QEMU_IO -c "read 0 512" $TEST_IMG 2>&1 | _filter_qemu_io | _filter_testdir
|
|
|
|
echo
|
|
echo "== offsets_size overflow ==="
|
|
_use_sample_img simple-pattern.cloop.bz2
|
|
poke_file "$TEST_IMG" "$n_blocks_offset" "\xff\xff\xff\xff"
|
|
$QEMU_IO -c "read 0 512" $TEST_IMG 2>&1 | _filter_qemu_io | _filter_testdir
|
|
|
|
echo
|
|
echo "== refuse images that require too many offsets ==="
|
|
_use_sample_img simple-pattern.cloop.bz2
|
|
poke_file "$TEST_IMG" "$n_blocks_offset" "\x04\x00\x00\x01"
|
|
$QEMU_IO -c "read 0 512" $TEST_IMG 2>&1 | _filter_qemu_io | _filter_testdir
|
|
|
|
echo
|
|
echo "== refuse images with non-monotonically increasing offsets =="
|
|
_use_sample_img simple-pattern.cloop.bz2
|
|
poke_file "$TEST_IMG" "$offsets_offset" "\x00\x00\x00\x00\xff\xff\xff\xff"
|
|
poke_file "$TEST_IMG" $((offsets_offset + 8)) "\x00\x00\x00\x00\xff\xfe\x00\x00"
|
|
$QEMU_IO -c "read 0 512" $TEST_IMG 2>&1 | _filter_qemu_io | _filter_testdir
|
|
|
|
echo
|
|
echo "== refuse images with invalid compressed block size =="
|
|
_use_sample_img simple-pattern.cloop.bz2
|
|
poke_file "$TEST_IMG" "$offsets_offset" "\x00\x00\x00\x00\x00\x00\x00\x00"
|
|
poke_file "$TEST_IMG" $((offsets_offset + 8)) "\xff\xff\xff\xff\xff\xff\xff\xff"
|
|
$QEMU_IO -c "read 0 512" $TEST_IMG 2>&1 | _filter_qemu_io | _filter_testdir
|
|
|
|
# success, all done
|
|
echo "*** done"
|
|
rm -f $seq.full
|
|
status=0
|