summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2019-12900.patch
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2020-02-05 11:32:52 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-11 23:05:12 +0000
commit495b6d9f248c2317ed7da31cb82d2928160809e5 (patch)
tree7591cc93cd4b25af893e866eeb29b594cdbd3f39 /meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2019-12900.patch
parent6eee202b9a87c0580dfa2848428795b465aa412a (diff)
downloadpoky-495b6d9f248c2317ed7da31cb82d2928160809e5.tar.gz
Revert "bzip2: Fix CVE-2019-12900"
This reverts commit 175e6cb75ce328d51a9d4ad18c7e09d9fb92c2e1. This change is already in bzip2 1.0.7. The change fixing a regression caused by this change is in 1.0.8 which is the current version in zeus. This isn't resulting in failures because the patch file isn't included in SRC_URI. (From OE-Core rev: ac6150563bd8e4cb2fa09a2777879afc993f1c20) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2019-12900.patch')
-rw-r--r--meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2019-12900.patch36
1 files changed, 0 insertions, 36 deletions
diff --git a/meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2019-12900.patch b/meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2019-12900.patch
deleted file mode 100644
index 9859d9d1a2..0000000000
--- a/meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2019-12900.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From 74de1e2e6ffc9d51ef9824db71a8ffee5962cdbc Mon Sep 17 00:00:00 2001
2From: Albert Astals Cid <aacid@kde.org>
3Date: Tue, 28 May 2019 19:35:18 +0200
4Subject: [PATCH] Make sure nSelectors is not out of range
5
6nSelectors is used in a loop from 0 to nSelectors to access selectorMtf
7which is
8UChar selectorMtf[BZ_MAX_SELECTORS];
9so if nSelectors is bigger than BZ_MAX_SELECTORS it'll do an invalid memory
10access
11Fixes out of bounds access discovered while fuzzying karchive
12
13Link: https://gitlab.com/federicomenaquintero/bzip2/commit/74de1e2e6ffc9d51ef9824db71a8ffee5962cdbc.patch
14
15Upstream-Status: Backport
16CVE: CVE-2019-12900.patch
17Signed-off-by: Saloni Jain <Saloni.Jain@kpit.com>
18---
19 decompress.c | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
22diff --git a/decompress.c b/decompress.c
23index ab6a624..f3db91d 100644
24--- a/decompress.c
25+++ b/decompress.c
26@@ -287,7 +287,7 @@ Int32 BZ2_decompress ( DState* s )
27 GET_BITS(BZ_X_SELECTOR_1, nGroups, 3);
28 if (nGroups < 2 || nGroups > 6) RETURN(BZ_DATA_ERROR);
29 GET_BITS(BZ_X_SELECTOR_2, nSelectors, 15);
30- if (nSelectors < 1) RETURN(BZ_DATA_ERROR);
31+ if (nSelectors < 1 || nSelectors > BZ_MAX_SELECTORS) RETURN(BZ_DATA_ERROR);
32 for (i = 0; i < nSelectors; i++) {
33 j = 0;
34 while (True) {
35--
362.22.0