summaryrefslogtreecommitdiffstats
path: root/fs/squashfs/squashfs.h
diff options
context:
space:
mode:
authorPhillip Lougher <phillip@lougher.demon.co.uk>2009-03-05 00:31:12 +0000
committerPhillip Lougher <phillip@lougher.demon.co.uk>2009-03-05 00:31:12 +0000
commit118e1ef6fabfc023126e6075f6ac0fc729cb5285 (patch)
tree3c497ad9fcc5a459de9d75a688bb78c5220e8dd5 /fs/squashfs/squashfs.h
parent2450cf51a1bdba7037e91b1bcc494b01c58aaf66 (diff)
downloadop-kernel-dev-118e1ef6fabfc023126e6075f6ac0fc729cb5285.zip
op-kernel-dev-118e1ef6fabfc023126e6075f6ac0fc729cb5285.tar.gz
Squashfs: Fix oops when reading fsfuzzer corrupted filesystems
This fixes a code regression caused by the recent mainlining changes. The recent code changes call zlib_inflate repeatedly, decompressing into separate 4K buffers, this code didn't check for the possibility that zlib_inflate might ask for too many buffers when decompressing corrupted data. 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 6b2515d..0e9feb6 100644
--- a/fs/squashfs/squashfs.h
+++ b/fs/squashfs/squashfs.h
@@ -34,7 +34,7 @@ static inline struct squashfs_inode_info *squashfs_i(struct inode *inode)
/* block.c */
extern int squashfs_read_data(struct super_block *, void **, u64, int, u64 *,
- int);
+ int, int);
/* cache.c */
extern struct squashfs_cache *squashfs_cache_init(char *, int, int);
OpenPOWER on IntegriCloud