diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-20 22:01:41 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-26 15:15:42 -0400 |
| commit | 5f32449c2863adf190b83402e9a4069cee054f9d (patch) | |
| tree | abb5d36646c95474f7c50bb161b8308c0a29267a /lib | |
| parent | b13fdebb805e4a4c7130f7405d7d3ddd3eeb2a77 (diff) | |
| download | linux-stable-5f32449c2863adf190b83402e9a4069cee054f9d.tar.gz linux-stable-5f32449c2863adf190b83402e9a4069cee054f9d.tar.bz2 linux-stable-5f32449c2863adf190b83402e9a4069cee054f9d.zip | |
lz4: ensure length does not wrap
commit 206204a1162b995e2185275167b22468c00d6b36 upstream.
Given some pathologically compressed data, lz4 could possibly decide to
wrap a few internal variables, causing unknown things to happen. Catch
this before the wrapping happens and abort the decompression.
Reported-by: "Don A. Bailey" <donb@securitymouse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/lz4/lz4_decompress.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/lz4/lz4_decompress.c b/lib/lz4/lz4_decompress.c index df6839e3ce08..99a03acb7d47 100644 --- a/lib/lz4/lz4_decompress.c +++ b/lib/lz4/lz4_decompress.c @@ -72,6 +72,8 @@ static int lz4_uncompress(const char *source, char *dest, int osize) len = *ip++; for (; len == 255; length += 255) len = *ip++; + if (unlikely(length > (size_t)(length + len))) + goto _output_error; length += len; } |