lz4: Security Fix for CVE-2021-3520

Source: https://github.com/lz4/lz4
MR: 111604
Type: Security Fix
Disposition: Backport from 8301a21773 (diff-7055e9cf14c488aea9837aaf9f528b58ee3c22988d7d0d81d172ec62d94a88a7)
ChangeID: 58492f950164e75954a97cf084df6f9af3d88244
Description:

(From OE-Core rev: 00acbc19a48e2b03c910ff5dc62e51eda32bdf03)

Signed-off-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Armin Kuster
2021-08-26 17:03:09 -07:00
committed by Richard Purdie
parent 043cb19a0d
commit 2a01b629de
2 changed files with 28 additions and 0 deletions

View File

@@ -0,0 +1,27 @@
From 8301a21773ef61656225e264f4f06ae14462bca7 Mon Sep 17 00:00:00 2001
From: Jasper Lievisse Adriaanse <j@jasper.la>
Date: Fri, 26 Feb 2021 15:21:20 +0100
Subject: [PATCH] Fix potential memory corruption with negative memmove() size
Upstream-Status: Backport
https://github.com/lz4/lz4/commit/8301a21773ef61656225e264f4f06ae14462bca7#diff-7055e9cf14c488aea9837aaf9f528b58ee3c22988d7d0d81d172ec62d94a88a7
CVE: CVE-2021-3520
Signed-off-by: Armin Kuster <akuster@mvista.com>
---
lib/lz4.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: git/lib/lz4.c
===================================================================
--- git.orig/lib/lz4.c
+++ git/lib/lz4.c
@@ -1665,7 +1665,7 @@ LZ4_decompress_generic(
const size_t dictSize /* note : = 0 if noDict */
)
{
- if (src == NULL) { return -1; }
+ if ((src == NULL) || (outputSize < 0)) { return -1; }
{ const BYTE* ip = (const BYTE*) src;
const BYTE* const iend = ip + srcSize;

View File

@@ -14,6 +14,7 @@ SRCREV = "fdf2ef5809ca875c454510610764d9125ef2ebbd"
SRC_URI = "git://github.com/lz4/lz4.git;branch=dev \
file://run-ptest \
file://CVE-2021-3520.patch \
"
UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>.*)"