diff options
| author | Phillip Lougher <phillip@lougher.demon.co.uk> | 2011-01-05 13:02:37 -0500 |
|---|---|---|
| committer | Phillip Lougher <phillip@lougher.demon.co.uk> | 2011-01-13 16:21:00 -0500 |
| commit | e7ee11f0ecd587caed0063c5f68ca20fef699f32 (patch) | |
| tree | 34a4075c1c42b6aa192a323a72f7c0c24a37caef | |
| parent | 170cf02165272dfe026eba183563bad973ca4f05 (diff) | |
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.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/squashfs/zlib_wrapper.c b/fs/squashfs/zlib_wrapper.c index 1f4833b87ea..ab5801f66e2 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, | |||
| 127 | goto release_mutex; | 127 | goto release_mutex; |
| 128 | } | 128 | } |
| 129 | 129 | ||
| 130 | if (k < b) { | ||
| 131 | ERROR("zlib_uncompress error, data remaining\n"); | ||
| 132 | goto release_mutex; | ||
| 133 | } | ||
| 134 | |||
| 130 | length = stream->total_out; | 135 | length = stream->total_out; |
| 131 | mutex_unlock(&msblk->read_data_mutex); | 136 | mutex_unlock(&msblk->read_data_mutex); |
| 132 | return length; | 137 | return length; |
