summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhillip Lougher <phillip@lougher.demon.co.uk>2011-01-05 18:02:37 +0000
committerPhillip Lougher <phillip@lougher.demon.co.uk>2011-01-13 21:21:00 +0000
commite7ee11f0ecd587caed0063c5f68ca20fef699f32 (patch)
tree34a4075c1c42b6aa192a323a72f7c0c24a37caef
parent170cf02165272dfe026eba183563bad973ca4f05 (diff)
downloadlinux-e7ee11f0ecd587caed0063c5f68ca20fef699f32.tar.bz2
Squashfs: add missing check in zlib_wrapper
On file system corruption zlib can return Z_STREAM_OK with input buffers remaining, which will not be released. Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
-rw-r--r--fs/squashfs/zlib_wrapper.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/squashfs/zlib_wrapper.c b/fs/squashfs/zlib_wrapper.c
index 1f4833b87ea3..ab5801f66e26 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;