From 0ff35e8148b9a226a6dd6771dc8b9c27c50453db Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 8 Dec 2021 12:41:55 +0100
Subject: main/lz4: backport fix for CVE-2021-3520

ref: https://github.com/lz4/lz4/pull/972
---
 main/lz4/APKBUILD            | 11 +++++++++--
 main/lz4/CVE-2021-3520.patch | 22 ++++++++++++++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 main/lz4/CVE-2021-3520.patch

diff --git a/main/lz4/APKBUILD b/main/lz4/APKBUILD
index 19cff7395af..526a34a96e5 100644
--- a/main/lz4/APKBUILD
+++ b/main/lz4/APKBUILD
@@ -9,9 +9,13 @@ arch="all"
 license="BSD-2-Clause GPL-2.0-only"
 checkdepends="diffutils"
 subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-libs $pkgname-tests:tests"
-source="$pkgname-$pkgver.tar.gz::https://github.com/lz4/lz4/archive/v$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/lz4/lz4/archive/v$pkgver.tar.gz
+	CVE-2021-3520.patch
+	"
 
 # secfixes:
+#   1.9.3-r0:
+#     - CVE-2021-3520
 #   1.9.2-r0:
 #     - CVE-2019-17543
 
@@ -35,4 +39,7 @@ package() {
 	make PREFIX="/usr" DESTDIR="$pkgdir" install
 }
 
-sha512sums="c246b0bda881ee9399fa1be490fa39f43b291bb1d9db72dba8a85db1a50aad416a97e9b300eee3d2a4203c2bd88bda2762e81bc229c3aa409ad217eb306a454c  lz4-1.9.3.tar.gz"
+sha512sums="
+c246b0bda881ee9399fa1be490fa39f43b291bb1d9db72dba8a85db1a50aad416a97e9b300eee3d2a4203c2bd88bda2762e81bc229c3aa409ad217eb306a454c  lz4-1.9.3.tar.gz
+29038d80c4399ded52b49e69d0f0d80bef8bf424e3540de366ef539706c8c1119784d6137c96130f131239d74a4c110dd9790cae5c9b17c102820446582c5637  CVE-2021-3520.patch
+"
diff --git a/main/lz4/CVE-2021-3520.patch b/main/lz4/CVE-2021-3520.patch
new file mode 100644
index 00000000000..053958dfe87
--- /dev/null
+++ b/main/lz4/CVE-2021-3520.patch
@@ -0,0 +1,22 @@
+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
+
+---
+ lib/lz4.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/lz4.c b/lib/lz4.c
+index 5f524d01d..c2f504ef3 100644
+--- a/lib/lz4.c
++++ b/lib/lz4.c
+@@ -1749,7 +1749,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;
-- 
cgit v1.2.3