[3/9] lz4: fix LZ4_decompress_safe_partial read out of bound

Commit Message

Andrew Morton April 8, 2022, 8:08 p.m. UTC

From: Guo Xuenan <[e-mail]>
Subject: lz4: fix LZ4_decompress_safe_partial read out of bound

When partialDecoding, it is EOF if we've either filled the output buffer
or can't proceed with reading an offset for following match.

In some extreme corner cases when compressed data is suitably
corrupted, UAF will occur.  As reported by KASAN [1],
LZ4_decompress_safe_partial may lead to read out of bound problem
during decoding.  lz4 upstream has fixed it [2] and this issue has been
disscussed here [3] before.

current decompression routine was ported from lz4 v1.8.3, bumping lib/lz4
to v1.9.+ is certainly a huge work to be done later, so, we'd better fix
it first.

[1] https://lore.kernel.org/all/[e-mail]/
[2] https://github.com/lz4/lz4/commit/c5d6f8a8be3927c0bec91bcc58667a6cfad244ad#
[3] https://lore.kernel.org/all/[e-mail]/

Link: https://lkml.kernel.org/r/[e-mail]
Reported-by: [e-mail]
Signed-off-by: Guo Xuenan <[e-mail]>
Reviewed-by: Nick Terrell <[e-mail]>
Acked-by: Gao Xiang <[e-mail]>
Cc: Yann Collet <[e-mail]>
Cc: Chengyang Fan <[e-mail]>
Cc: <[e-mail]>
Signed-off-by: Andrew Morton <[e-mail]>
---

 lib/lz4/lz4_decompress.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Patch

--- a/lib/lz4/lz4_decompress.c~lz4-fix-lz4_decompress_safe_partial-read-out-of-bound
+++ a/lib/lz4/lz4_decompress.c
@@ -271,8 +271,12 @@  static FORCE_INLINE int LZ4_decompress_g
 			ip += length;
 			op += length;
 
-			/* Necessarily EOF, due to parsing restrictions */
-			if (!partialDecoding || (cpy == oend))
+			/* Necessarily EOF when !partialDecoding.
+			 * When partialDecoding, it is EOF if we've either
+			 * filled the output buffer or
+			 * can't proceed with reading an offset for following match.
+			 */
+			if (!partialDecoding || (cpy == oend) || (ip >= (iend - 2)))
 				break;
 		} else {
 			/* may overwrite up to WILDCOPYLENGTH beyond cpy */