[PATCH 2/5] Squashfs: add missing check in zlib_wrapper
DORMANTno replies
From: Phillip Lougher <hidden>
Date: 2011-01-06 21:21:06
Also in:
lkml
Subsystem:
filesystems (vfs and infrastructure), squashfs file system, the rest · Maintainers:
Alexander Viro, Christian Brauner, Phillip Lougher, Linus Torvalds
On file system corruption zlib can return Z_STREAM_OK with input buffers remaining, which will not be released. Signed-off-by: Phillip Lougher <redacted> --- fs/squashfs/zlib_wrapper.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/fs/squashfs/zlib_wrapper.c b/fs/squashfs/zlib_wrapper.c
index 1f4833b..ab5801f 100644
--- a/fs/squashfs/zlib_wrapper.c
+++ b/fs/squashfs/zlib_wrapper.c@@ -127,6 +127,11 @@ static int zlib_uncompress(struct squashfs_sb_info *msblk, void **buffer, goto release_mutex; } + if (k < b) { + ERROR("zlib_uncompress error, data remaining\n"); + goto release_mutex; + } + length = stream->total_out; mutex_unlock(&msblk->read_data_mutex); return length;
--
1.6.3.3