ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

tests: rewrite fsck-bad-header 

Fix test for systems with pagesize != 4096
Loop over many combinations of sizes, endianness and blocksizes.

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
This commit is contained in:
Ruediger Meier 2018-01-23 16:59:24 +01:00 committed by Karel Zak
parent 2374b1ab75
commit c990f94cbc
8 changed files with 243 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/expected/cramfs/fsck-bad-header
View File

@ -1 +0,0 @@
fsck.cramfs: superblock size (76) too small

29
tests/expected/cramfs/fsck-bad-header-nopad-4K-be Normal file
View File

@ -0,0 +1,29 @@
## size: 0
fsck.cramfs: superblock size (0) too small
ret: 4
## size: 75
fsck.cramfs: superblock size (75) too small
ret: 4
## size: 76
fsck.cramfs: file extends past end of filesystem
fsck.cramfs: crc error
ret: 4
## size: 4095
fsck.cramfs: file extends past end of filesystem
fsck.cramfs: crc error
ret: 4
## size: 4096
ret: 0
## size: 4097
fsck.cramfs: file length too short
ret: 4
## size: 4294967295
fsck.cramfs: file length too short
ret: 4

29
tests/expected/cramfs/fsck-bad-header-nopad-4K-le Normal file
View File

@ -0,0 +1,29 @@
## size: 0
fsck.cramfs: superblock size (0) too small
ret: 4
## size: 75
fsck.cramfs: superblock size (75) too small
ret: 4
## size: 76
fsck.cramfs: file extends past end of filesystem
fsck.cramfs: crc error
ret: 4
## size: 4095
fsck.cramfs: file extends past end of filesystem
fsck.cramfs: crc error
ret: 4
## size: 4096
ret: 0
## size: 4097
fsck.cramfs: file length too short
ret: 4
## size: 4294967295
fsck.cramfs: file length too short
ret: 4

29
tests/expected/cramfs/fsck-bad-header-pad-4K-be Normal file
View File

@ -0,0 +1,29 @@
## size: 76
fsck.cramfs: superblock size (76) too small
ret: 4
## size: 587
fsck.cramfs: superblock size (587) too small
ret: 4
## size: 588
fsck.cramfs: file extends past end of filesystem
fsck.cramfs: crc error
ret: 4
## size: 4095
fsck.cramfs: file extends past end of filesystem
fsck.cramfs: crc error
ret: 4
## size: 4096
ret: 0
## size: 4097
fsck.cramfs: file length too short
ret: 4
## size: 4294967295
fsck.cramfs: file length too short
ret: 4

29
tests/expected/cramfs/fsck-bad-header-pad-4K-le Normal file
View File

@ -0,0 +1,29 @@
## size: 76
fsck.cramfs: superblock size (76) too small
ret: 4
## size: 587
fsck.cramfs: superblock size (587) too small
ret: 4
## size: 588
fsck.cramfs: file extends past end of filesystem
fsck.cramfs: crc error
ret: 4
## size: 4095
fsck.cramfs: file extends past end of filesystem
fsck.cramfs: crc error
ret: 4
## size: 4096
ret: 0
## size: 4097
fsck.cramfs: file length too short
ret: 4
## size: 4294967295
fsck.cramfs: file length too short
ret: 4

29
tests/expected/cramfs/fsck-bad-header-pad-64K-be Normal file
View File

@ -0,0 +1,29 @@
## size: 76
fsck.cramfs: superblock size (76) too small
ret: 4
## size: 587
fsck.cramfs: superblock size (587) too small
ret: 4
## size: 588
fsck.cramfs: file extends past end of filesystem
fsck.cramfs: crc error
ret: 4
## size: 65535
fsck.cramfs: file extends past end of filesystem
fsck.cramfs: crc error
ret: 4
## size: 65536
ret: 0
## size: 65537
fsck.cramfs: file length too short
ret: 4
## size: 4294967295
fsck.cramfs: file length too short
ret: 4

29
tests/expected/cramfs/fsck-bad-header-pad-64K-le Normal file
View File

@ -0,0 +1,29 @@
## size: 76
fsck.cramfs: superblock size (76) too small
ret: 4
## size: 587
fsck.cramfs: superblock size (587) too small
ret: 4
## size: 588
fsck.cramfs: file extends past end of filesystem
fsck.cramfs: crc error
ret: 4
## size: 65535
fsck.cramfs: file extends past end of filesystem
fsck.cramfs: crc error
ret: 4
## size: 65536
ret: 0
## size: 65537
fsck.cramfs: file length too short
ret: 4
## size: 4294967295
fsck.cramfs: file length too short
ret: 4

74
tests/ts/cramfs/fsck-bad-header
View File

@ -25,14 +25,78 @@ ts_check_test_command "$TS_CMD_MKCRAMFS"
ts_check_test_command "$TS_CMD_FSCKCRAMFS"
ts_check_prog "dd"
IMAGE_SOURCE="$TS_OUTDIR/${TS_TESTNAME}-data/root"
function num2binary()
{
local num=$1
local endian=$2
test "$num" -ge 0 -a "$num" -le 4294967295 || return 1
test "$endian" = "be" -o "$endian" = "le" || return 1
# how to do that easier?
if test "$endian" = "be"; then
echo -en "$(printf "%08x" "$1" | sed 's/\(..\)/\\x\1/g')"
else
echo -en "$(printf "%08x" "$1" | sed 's/^\(..\)\(..\)\(..\)\(..\)$/\\x\4\\x\3\\x\2\\x\1/')"
fi
}
function fsck_loop_sizes()
{
local endian=$1 # be, le
local seek=$2 # 4 for nopad, 516 for pad
shift 2 # the rest are sizes to loop over
for size in "$@"; do
ts_log "## size: $size"
cp -a "$IMAGE_FILE" "$IMAGE_FILE.tmp"
num2binary "$size" $endian |
dd of="$IMAGE_FILE.tmp" bs=1 seek="$seek" count=4 conv=notrunc &> /dev/null
$TS_CMD_FSCKCRAMFS "$IMAGE_FILE.tmp" >> $TS_OUTPUT 2>&1
ts_log "ret: $?
"
done
rm -f "$IMAGE_FILE"
}
IMAGE_SOURCE="$TS_OUTDIR/${TS_TESTNAME}-data"
IMAGE_FILE="$TS_OUTDIR/${TS_TESTNAME}-cramfs.img"
mkdir -p "${IMAGE_SOURCE}/subdir" &> /dev/null
$TS_CMD_MKCRAMFS -p -N big $IMAGE_SOURCE $IMAGE_FILE &> /dev/null
echo -ne \\00\\x4c |
dd of=$IMAGE_FILE bs=1 seek=518 count=2 conv=notrunc &> /dev/null
$TS_CMD_FSCKCRAMFS $IMAGE_FILE >> $TS_OUTPUT 2>&1
ts_init_subtest "nopad-4K-be"
$TS_CMD_MKCRAMFS -N big -b 4096 $IMAGE_SOURCE $IMAGE_FILE &> /dev/null
fsck_loop_sizes be 4 0 75 76 4095 4096 4097 4294967295
rm -f "$IMAGE_FILE"
ts_finalize_subtest
ts_init_subtest "nopad-4K-le"
$TS_CMD_MKCRAMFS -N little -b 4096 $IMAGE_SOURCE $IMAGE_FILE &> /dev/null
fsck_loop_sizes le 4 0 75 76 4095 4096 4097 4294967295
ts_finalize_subtest
ts_init_subtest "pad-4K-be"
$TS_CMD_MKCRAMFS -p -N big -b 4096 $IMAGE_SOURCE $IMAGE_FILE &> /dev/null
fsck_loop_sizes be 516 76 587 588 4095 4096 4097 4294967295
ts_finalize_subtest
ts_init_subtest "pad-4K-le"
$TS_CMD_MKCRAMFS -p -N little -b 4096 $IMAGE_SOURCE $IMAGE_FILE &> /dev/null
fsck_loop_sizes le 516 76 587 588 4095 4096 4097 4294967295
ts_finalize_subtest
ts_init_subtest "pad-64K-be"
$TS_CMD_MKCRAMFS -p -N big -b 65536 $IMAGE_SOURCE $IMAGE_FILE &> /dev/null
fsck_loop_sizes be 516 76 587 588 65535 65536 65537 4294967295
ts_finalize_subtest
ts_init_subtest "pad-64K-le"
$TS_CMD_MKCRAMFS -p -N little -b 65536 $IMAGE_SOURCE $IMAGE_FILE &> /dev/null
fsck_loop_sizes le 516 76 587 588 65535 65536 65537 4294967295
ts_finalize_subtest
rm -rf "$IMAGE_SOURCE" "$IMAGE_FILE.tmp"
ts_finalize