Squashfs: add missing check in zlib_wrapper

PATCH In review Phillip Lougher 1 participant 1 message Jan 6, 2011

Subsystems (2)

VFS SquashFS file system

lore

Share & tools

lore

Phillip Lougher

author

2011-01-06 21:21 UTC #0 lore raw

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 <[email protected]>

---
 fs/squashfs/zlib_wrapper.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

fs/squashfs/zlib_wrapper.c +5 -0

index 1f4833b..ab5801f 100644
@@ -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;

Signature · 1 line

1.6.3.3