2010-04-23 02:17:08

by Phillip Lougher

[permalink] [raw]
Subject: [PATCH 1/4] squashfs: fix locking bug in zlib wrapper


Fix locking bug in zlib wrapper introduced by recent decompressor changes.

Signed-off-by: Phillip Lougher <[email protected]>
---
fs/squashfs/zlib_wrapper.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/fs/squashfs/zlib_wrapper.c b/fs/squashfs/zlib_wrapper.c
index 15a03d0..7a60387 100644
--- a/fs/squashfs/zlib_wrapper.c
+++ b/fs/squashfs/zlib_wrapper.c
@@ -128,8 +128,9 @@ static int zlib_uncompress(struct squashfs_sb_info *msblk, void **buffer,
goto release_mutex;
}

+ length = stream->total_out;
mutex_unlock(&msblk->read_data_mutex);
- return stream->total_out;
+ return length;

release_mutex:
mutex_unlock(&msblk->read_data_mutex);
--
1.6.3.3