Skip to content

Commit eafc0a0

Browse files
JonathanSmithGuotorvalds
authored andcommitted
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/000000000000830d1205cf7f0477@google.com/ [2] lz4/lz4@c5d6f8a [3] https://lore.kernel.org/all/CC666AE8-4CA4-4951-B6FB-A2EFDE3AC03B@fb.com/ Link: https://lkml.kernel.org/r/20211111105048.2006070-1-guoxuenan@huawei.com Reported-by: syzbot+63d688f1d899c588fb71@syzkaller.appspotmail.com Signed-off-by: Guo Xuenan <guoxuenan@huawei.com> Reviewed-by: Nick Terrell <terrelln@fb.com> Acked-by: Gao Xiang <hsiangkao@linux.alibaba.com> Cc: Yann Collet <cyan@fb.com> Cc: Chengyang Fan <cy.fan@huawei.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 66f133c commit eafc0a0

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

lib/lz4/lz4_decompress.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,12 @@ static FORCE_INLINE int LZ4_decompress_generic(
271271
ip += length;
272272
op += length;
273273

274-
/* Necessarily EOF, due to parsing restrictions */
275-
if (!partialDecoding || (cpy == oend))
274+
/* Necessarily EOF when !partialDecoding.
275+
* When partialDecoding, it is EOF if we've either
276+
* filled the output buffer or
277+
* can't proceed with reading an offset for following match.
278+
*/
279+
if (!partialDecoding || (cpy == oend) || (ip >= (iend - 2)))
276280
break;
277281
} else {
278282
/* may overwrite up to WILDCOPYLENGTH beyond cpy */

0 commit comments

Comments
 (0)