summaryrefslogtreecommitdiffstats
path: root/recipes-extended/libarchive/libarchive/CVE-2017-5601.patch
diff options
context:
space:
mode:
authorMartin Borg <martin.borg@enea.com>2018-03-01 10:39:47 +0100
committerMartin Borg <martin.borg@enea.com>2018-03-01 10:42:05 +0100
commitb6d4cd74cebeded8a49c06c6d7a52c32769f3ed8 (patch)
treea956a4fb98f38e062dcfda04e9aef05f1451bf5c /recipes-extended/libarchive/libarchive/CVE-2017-5601.patch
parent2c0b43b3032f9a55edd395ae37f45fffce44fa9d (diff)
downloadmeta-el-common-b6d4cd74cebeded8a49c06c6d7a52c32769f3ed8.tar.gz
freetype/libarchive/gnutls: Drop CVE patches
The CVEs have been fixed in upstream poky/rocko. Signed-off-by: Martin Borg <martin.borg@enea.com>
Diffstat (limited to 'recipes-extended/libarchive/libarchive/CVE-2017-5601.patch')
-rw-r--r--recipes-extended/libarchive/libarchive/CVE-2017-5601.patch28
1 files changed, 0 insertions, 28 deletions
diff --git a/recipes-extended/libarchive/libarchive/CVE-2017-5601.patch b/recipes-extended/libarchive/libarchive/CVE-2017-5601.patch
deleted file mode 100644
index a5298f5..0000000
--- a/recipes-extended/libarchive/libarchive/CVE-2017-5601.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From 98dcbbf0bf4854bf987557e55e55fff7abbf3ea9 Mon Sep 17 00:00:00 2001
2From: Martin Matuska <martin@matuska.org>
3Date: Thu, 19 Jan 2017 22:00:18 +0100
4Subject: [PATCH] Fail with negative lha->compsize in lha_read_file_header_1()
5 Fixes a heap buffer overflow reported in Secunia SA74169
6
7CVE: CVE-2017-5601
8Upstream-Status: Backport [https://github.com/libarchive/libarchive/commit/98dcbbf0bf4854bf987557e55e55fff7abbf3ea9.patch]
9
10Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
11---
12 libarchive/archive_read_support_format_lha.c | 3 +++
13 1 file changed, 3 insertions(+)
14
15diff --git a/libarchive/archive_read_support_format_lha.c b/libarchive/archive_read_support_format_lha.c
16index 52a5531b0..d77a7c2e4 100644
17--- a/libarchive/archive_read_support_format_lha.c
18+++ b/libarchive/archive_read_support_format_lha.c
19@@ -924,6 +924,9 @@ lha_read_file_header_1(struct archive_read *a, struct lha *lha)
20 /* Get a real compressed file size. */
21 lha->compsize -= extdsize - 2;
22
23+ if (lha->compsize < 0)
24+ goto invalid; /* Invalid compressed file size */
25+
26 if (sum_calculated != headersum) {
27 archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
28 "LHa header sum error");