package/libarchive: add upstream security fixes
PATCH 1/1 package/libarchive: add upstream security fixes
CVE-2019-1000019: Crash when parsing some 7zip archives.
CVE-2019-1000020: A corrupted or malicious ISO9660 image can cause read_CE() to loop forever.
--- ...n-expected-Rockridge-extensions-is-m.patch | 62 +++++++++++++++++++ ...-crash-when-parsing-certain-archives.patch | 62 +++++++++++++++++++ 2 files changed, 124 insertions(+) create mode 100644 package/libarchive/0005-iso9660-Fail-when-expected-Rockridge-extensions-is-m.patch create mode 100644 package/libarchive/0006-7zip-fix-crash-when-parsing-certain-archives.patch
package/libarchive/0005-iso9660-Fail-when-expected-Rockridge-extensions-is-m.patch new file +62 -0
@@ -0,0 +1,62 @@ +From 8312eaa576014cd9b965012af51bc1f967b12423 Mon Sep 17 00:00:00 2001 +From: Daniel Axtens <[email protected]> +Date: Tue, 1 Jan 2019 17:10:49 +1100 +Subject: [PATCH] iso9660: Fail when expected Rockridge extensions is missing + +A corrupted or malicious ISO9660 image can cause read_CE() to loop +forever. + +read_CE() calls parse_rockridge(), expecting a Rockridge extension +to be read. However, parse_rockridge() is structured as a while +loop starting with a sanity check, and if the sanity check fails +before the loop has run, the function returns ARCHIVE_OK without +advancing the position in the file. This causes read_CE() to retry +indefinitely. + +Make parse_rockridge() return ARCHIVE_WARN if it didn't read an +extension. As someone with no real knowledge of the format, this +seems more apt than ARCHIVE_FATAL, but both the call-sites escalate +it to a fatal error immediately anyway. + +Found with a combination of AFL, afl-rb (FairFuzz) and qsym. + +Signed-off-by: Baruch Siach <[email protected]> +--- +Upstream status: commit 8312eaa57601 + + libarchive/archive_read_support_format_iso9660.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c +index 28acfefbba8a..bad8f1dfef3a 100644 +--- a/libarchive/archive_read_support_format_iso9660.c ++++ b/libarchive/archive_read_support_format_iso9660.c +@@ -2102,6 +2102,7 @@ parse_rockridge(struct archive_read *a, struct file_info *file, + const unsigned char *p, const unsigned char *end) + { + struct iso9660 *iso9660; ++ int entry_seen = 0; + + iso9660 = (struct iso9660 *)(a->format->data); + +@@ -2257,8 +2258,16 @@ parse_rockridge(struct archive_read *a, struct file_info *file, + } + + p += p[2]; ++ entry_seen = 1; ++ } ++ ++ if (entry_seen) ++ return (ARCHIVE_OK); ++ else { ++ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT, ++ "Tried to parse Rockridge extensions, but none found"); ++ return (ARCHIVE_WARN); + } +- return (ARCHIVE_OK); + } + + static int +-- +2.20.1 +
package/libarchive/0006-7zip-fix-crash-when-parsing-certain-archives.patch new file +62 -0
62 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH 1/1 package/libarchive: add upstream security fixes
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Baruch" == Baruch Siach <[email protected]> writes:
CVE-2019-1000019: Crash when parsing some 7zip archives.
CVE-2019-1000020: A corrupted or malicious ISO9660 image can causeread_CE()to loop forever.Signed-off-by Baruch Siach <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/1 package/libarchive: add upstream security fixes
In reply to Baruch SiachQuoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Baruch" == Baruch Siach <[email protected]> writes:
CVE-2019-1000019: Crash when parsing some 7zip archives.
CVE-2019-1000020: A corrupted or malicious ISO9660 image can causeread_CE()to loop forever.Signed-off-by Baruch Siach <[email protected]>
Committed to 2018.02.x and 2018.11.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard