From 91e86347fe4361705bb13a616e1c7b2b62f6cc6a Mon Sep 17 00:00:00 2001
From: Phillip Lougher <phillip@lougher.demon.co.uk>
Date: Wed, 5 Jan 2011 18:02:37 +0000
Subject: [PATCH] --- yaml --- r: 231535 b: refs/heads/master c:
 e7ee11f0ecd587caed0063c5f68ca20fef699f32 h: refs/heads/master i:   231533:
 703081da2a99426999c67eaf378063dd74d0a4f6   231531:
 454cd236db73c4e82e3889c6e43298c7e7110764   231527:
 02580d16c8ac0a2471213cacd5c6aeae0ea2908f   231519:
 c6c6122fa740f8ad02228ef7b3638444e9f3d22c v: v3

---
 [refs]                           | 2 +-
 trunk/fs/squashfs/zlib_wrapper.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 99060e15ae20..0e25cbb3024f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 170cf02165272dfe026eba183563bad973ca4f05
+refs/heads/master: e7ee11f0ecd587caed0063c5f68ca20fef699f32
diff --git a/trunk/fs/squashfs/zlib_wrapper.c b/trunk/fs/squashfs/zlib_wrapper.c
index 1f4833b87ea3..ab5801f66e26 100644
--- a/trunk/fs/squashfs/zlib_wrapper.c
+++ b/trunk/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;