[<prev] [next>] [day] [month] [year] [list]
Message-ID: <4D26323F.5060906@lougher.demon.co.uk>
Date: Thu, 06 Jan 2011 21:21:03 +0000
From: Phillip Lougher <phillip@...gher.demon.co.uk>
To: linux Kernel Development <linux-kernel@...r.kernel.org>
CC: linux-fsdevel@...r.kernel.org
Subject: [PATCH 2/5] 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@...gher.demon.co.uk>
---
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists