diff options
| author | Ruediger Meier | 2018-01-23 16:59:23 +0100 |
|---|---|---|
| committer | Karel Zak | 2018-01-24 12:53:31 +0100 |
| commit | 2374b1ab75c66c9ecea86fc97abb6d6c048bcf45 (patch) | |
| tree | 522a10d56c5b963514f76fc2577481d902c1350d | |
| parent | Revert "fsck.cramfs: Fix bus error on broken file system." (diff) | |
| download | kernel-qcow2-util-linux-2374b1ab75c66c9ecea86fc97abb6d6c048bcf45.tar.gz kernel-qcow2-util-linux-2374b1ab75c66c9ecea86fc97abb6d6c048bcf45.tar.xz kernel-qcow2-util-linux-2374b1ab75c66c9ecea86fc97abb6d6c048bcf45.zip | |
fsck.cramfs: fix crash when superblock size is too small
This hopefully fixes the original problem addressed by the reverted
patch 7cb962c7.
The bug was introduced by myself in
f991dbd3 "fsck.cramfs: allow smaller superblock sizes"
CC: Tobias Stoeckmann <tobias@stoeckmann.org>
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
| -rw-r--r-- | disk-utils/fsck.cramfs.c | 2 | ||||
| -rw-r--r-- | tests/expected/cramfs/fsck-bad-header | 3 | ||||
| -rwxr-xr-x | tests/ts/cramfs/fsck-bad-header | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/disk-utils/fsck.cramfs.c b/disk-utils/fsck.cramfs.c index 50c7d33b9..820816b14 100644 --- a/disk-utils/fsck.cramfs.c +++ b/disk-utils/fsck.cramfs.c @@ -192,7 +192,7 @@ static void test_super(int *start, size_t * length) errx(FSCK_EX_ERROR, _("unsupported filesystem features")); /* What are valid superblock sizes? */ - if (super.size < sizeof(struct cramfs_super)) + if (super.size < *start + sizeof(struct cramfs_super)) errx(FSCK_EX_UNCORRECTED, _("superblock size (%d) too small"), super.size); diff --git a/tests/expected/cramfs/fsck-bad-header b/tests/expected/cramfs/fsck-bad-header index ade8a9c3a..41c2c125e 100644 --- a/tests/expected/cramfs/fsck-bad-header +++ b/tests/expected/cramfs/fsck-bad-header @@ -1,2 +1 @@ -fsck.cramfs: file extends past end of filesystem -fsck.cramfs: crc error +fsck.cramfs: superblock size (76) too small diff --git a/tests/ts/cramfs/fsck-bad-header b/tests/ts/cramfs/fsck-bad-header index 8d5309c35..add388577 100755 --- a/tests/ts/cramfs/fsck-bad-header +++ b/tests/ts/cramfs/fsck-bad-header @@ -16,7 +16,7 @@ # GNU General Public License for more details. # TS_TOPDIR="${0%/*}/../.." -TS_DESC="fsck endianness" +TS_DESC="fsck bad header" . $TS_TOPDIR/functions.sh ts_init "$*" |