diff options
author | Phillip Lougher <phillip@lougher.demon.co.uk> | 2011-05-23 23:33:34 -0400 |
---|---|---|
committer | Phillip Lougher <phillip@lougher.demon.co.uk> | 2011-05-25 13:21:33 -0400 |
commit | 1cac63cc9b2ff0d16ab2d16232b1a6ee8676a47b (patch) | |
tree | 31ee36dac4a1b351c153058ffa0799a959ba0272 /fs/squashfs/squashfs.h | |
parent | ac51a0a7139aa93bf1176b701c86fa3d2bdf6106 (diff) |
Squashfs: add sanity checks to fragment reading at mount time
Fsfuzzer generates corrupted filesystems which throw a warn_on in
kmalloc. One of these is due to a corrupted superblock fragments 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 fragment 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.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/squashfs/squashfs.h b/fs/squashfs/squashfs.h index 3b705f137ebb..647b81b477d4 100644 --- a/fs/squashfs/squashfs.h +++ b/fs/squashfs/squashfs.h | |||
@@ -57,7 +57,7 @@ extern __le64 *squashfs_read_inode_lookup_table(struct super_block *, u64, u64, | |||
57 | /* fragment.c */ | 57 | /* fragment.c */ |
58 | extern int squashfs_frag_lookup(struct super_block *, unsigned int, u64 *); | 58 | extern int squashfs_frag_lookup(struct super_block *, unsigned int, u64 *); |
59 | extern __le64 *squashfs_read_fragment_index_table(struct super_block *, | 59 | extern __le64 *squashfs_read_fragment_index_table(struct super_block *, |
60 | u64, unsigned int); | 60 | u64, u64, unsigned int); |
61 | 61 | ||
62 | /* id.c */ | 62 | /* id.c */ |
63 | extern int squashfs_get_id(struct super_block *, unsigned int, unsigned int *); | 63 | extern int squashfs_get_id(struct super_block *, unsigned int, unsigned int *); |