Commit 8bb0269160df2a60764013994d0bc5165406cf4a

Authored by Phillip Lougher
Committed by Linus Torvalds
1 parent 2e591bbc0d

[PATCH] corrupted cramfs filesystems cause kernel oops

Steve Grubb's fzfuzzer tool (http://people.redhat.com/sgrubb/files/
fsfuzzer-0.6.tar.gz) generates corrupt Cramfs filesystems which cause
Cramfs to kernel oops in cramfs_uncompress_block().  The cause of the oops
is an unchecked corrupted block length field read by cramfs_readpage().

This patch adds a sanity check to cramfs_readpage() which checks that the
block length field is sensible.  The (PAGE_CACHE_SIZE << 1) size check is
intentional, even though the uncompressed data is not going to be larger
than PAGE_CACHE_SIZE, gzip sometimes generates compressed data larger than
the original source data.  Mkcramfs checks that the compressed size is
always less than or equal to PAGE_CACHE_SIZE << 1.  Of course Cramfs could
use the original uncompressed data in this case, but it doesn't.

Signed-off-by: Phillip Lougher <phillip@lougher.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 1 changed file with 2 additions and 0 deletions Side-by-side Diff

... ... @@ -481,6 +481,8 @@
481 481 pgdata = kmap(page);
482 482 if (compr_len == 0)
483 483 ; /* hole */
  484 + else if (compr_len > (PAGE_CACHE_SIZE << 1))
  485 + printk(KERN_ERR "cramfs: bad compressed blocksize %u\n", compr_len);
484 486 else {
485 487 mutex_lock(&read_mutex);
486 488 bytes_filled = cramfs_uncompress_block(pgdata,