path: root/fs/squashfs/super.c
diff options
authorPhillip Lougher <phillip@lougher.demon.co.uk>2011-05-24 04:15:21 +0100
committerPhillip Lougher <phillip@lougher.demon.co.uk>2011-05-25 18:21:32 +0100
commitac51a0a7139aa93bf1176b701c86fa3d2bdf6106 (patch)
tree776d75b5cd1712d43feecc698b855173ed6ee57f /fs/squashfs/super.c
parent37986f63c81bf23c856f65fc5e4830550e7f3d5b (diff)
Squashfs: add sanity checks to lookup table reading at mount time
Fsfuzzer generates corrupted filesystems which throw a warn_on in kmalloc. One of these is due to a corrupted superblock inodes field. Fix this by checking that the number of bytes to be read (and allocated) does not extend into the next filesystem structure. Also add a couple of other sanity checks of the mount-time lookup table structures. Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
Diffstat (limited to 'fs/squashfs/super.c')
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/squashfs/super.c b/fs/squashfs/super.c
index 8f5f2781a60..80a7119870a 100644
--- a/fs/squashfs/super.c
+++ b/fs/squashfs/super.c
@@ -245,6 +245,7 @@ allocate_id_index_table:
msblk->id_table = NULL;
goto failed_mount;
+ next_table = msblk->id_table[0];
/* Handle inode lookup table */
lookup_table_start = le64_to_cpu(sblk->lookup_table_start);
@@ -253,7 +254,7 @@ allocate_id_index_table:
/* Allocate and read inode lookup table */
msblk->inode_lookup_table = squashfs_read_inode_lookup_table(sb,
- lookup_table_start, msblk->inodes);
+ lookup_table_start, next_table, msblk->inodes);
if (IS_ERR(msblk->inode_lookup_table)) {
ERROR("unable to read inode lookup table\n");
err = PTR_ERR(msblk->inode_lookup_table);