summaryrefslogtreecommitdiffstats
path: root/fs/squashfs/squashfs.h
diff options
context:
space:
mode:
authorPhillip Lougher <phillip@lougher.demon.co.uk>2011-05-24 04:05:22 +0100
committerPhillip Lougher <phillip@lougher.demon.co.uk>2011-05-25 18:21:32 +0100
commit37986f63c81bf23c856f65fc5e4830550e7f3d5b (patch)
treeaafcc2078b469fb8fdb6e43255e136fcc7059dc9 /fs/squashfs/squashfs.h
parent6f04864515365e135adc9f1cee4ac1251bb0ed35 (diff)
downloadop-kernel-dev-37986f63c81bf23c856f65fc5e4830550e7f3d5b.zip
op-kernel-dev-37986f63c81bf23c856f65fc5e4830550e7f3d5b.tar.gz
Squashfs: add sanity checks to id reading at mount time
Fsfuzzer generates corrupted filesystems which throw a warn_on in kmalloc. One of these is due to a corrupted superblock no_ids 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 id table structures. Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
Diffstat (limited to 'fs/squashfs/squashfs.h')
-rw-r--r--fs/squashfs/squashfs.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/squashfs/squashfs.h b/fs/squashfs/squashfs.h
index d622e84..0e3d220 100644
--- a/fs/squashfs/squashfs.h
+++ b/fs/squashfs/squashfs.h
@@ -61,7 +61,7 @@ extern __le64 *squashfs_read_fragment_index_table(struct super_block *,
/* id.c */
extern int squashfs_get_id(struct super_block *, unsigned int, unsigned int *);
-extern __le64 *squashfs_read_id_index_table(struct super_block *, u64,
+extern __le64 *squashfs_read_id_index_table(struct super_block *, u64, u64,
unsigned short);
/* inode.c */
OpenPOWER on IntegriCloud