projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
170cf02
)
Squashfs: add missing check in zlib_wrapper
author
Phillip Lougher
<phillip@lougher.demon.co.uk>
Wed, 5 Jan 2011 18:02:37 +0000
(18:02 +0000)
committer
Phillip Lougher
<phillip@lougher.demon.co.uk>
Thu, 13 Jan 2011 21:21:00 +0000
(21:21 +0000)
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>
fs/squashfs/zlib_wrapper.c
patch
|
blob
|
history
diff --git
a/fs/squashfs/zlib_wrapper.c
b/fs/squashfs/zlib_wrapper.c
index 1f4833b87ea30677f070ac45d2cc57a5765d57fc..ab5801f66e2670931bc3e6e8fff8704df107beca 100644
(file)
--- 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;