diff options
| author |   Amin Hassani <ahassani@chromium.org> | 2019-03-25 11:25:34 -0700 |
|---|---|---|
| committer |   Thomas Deutschmann <whissi@gentoo.org> | 2019-04-26 10:34:55 +0200 |
| commit | 1948811390283ff8e5f122bd9ec68f2e7b907450 (patch) | |
| tree | d782cdd6f2172a86457ae52593ad7b5855474e9e /app-arch | |
| parent | app-admin/hcloud: first commit (diff) | |
| download | gentoo-1948811390283ff8e5f122bd9ec68f2e7b907450.tar.gz gentoo-1948811390283ff8e5f122bd9ec68f2e7b907450.tar.bz2 gentoo-1948811390283ff8e5f122bd9ec68f2e7b907450.zip | |
app-arch/bzip2: check for nselector's upperbound
In bzip2 decompressor, the upper bound of nselectors have not been
checked and hence a bad payload can cause a segfault. This patch adds
that required upperbound check.
Signed-off-by: Amin Hassani <ahassani@chromium.org>
Closes: https://github.com/gentoo/gentoo/pull/11503
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'app-arch')
| -rw-r--r-- | app-arch/bzip2/bzip2-1.0.6-r11.ebuild (renamed from app-arch/bzip2/bzip2-1.0.6-r10.ebuild) | 1 | ||||
| -rw-r--r-- | app-arch/bzip2/files/bzip2-1.0.6-nselectors-upper-bound-check.patch | 30 |
2 files changed, 31 insertions, 0 deletions
diff --git a/app-arch/bzip2/bzip2-1.0.6-r10.ebuild b/app-arch/bzip2/bzip2-1.0.6-r11.ebuild index 5fb91d277fa8..646f6a08d890 100644 --- a/app-arch/bzip2/bzip2-1.0.6-r10.ebuild +++ b/app-arch/bzip2/bzip2-1.0.6-r11.ebuild @@ -28,6 +28,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.0.6-out-of-tree-build.patch "${FILESDIR}"/${PN}-1.0.6-CVE-2016-3189.patch #620466 "${FILESDIR}"/${PN}-1.0.6-ubsan-error.patch + "${FILESDIR}"/${PN}-1.0.6-nselectors-upper-bound-check.patch ) DOCS=( CHANGES README{,.COMPILATION.PROBLEMS,.XML.STUFF} manual.pdf ) diff --git a/app-arch/bzip2/files/bzip2-1.0.6-nselectors-upper-bound-check.patch b/app-arch/bzip2/files/bzip2-1.0.6-nselectors-upper-bound-check.patch new file mode 100644 index 000000000000..a7731f7de8f7 --- /dev/null +++ b/app-arch/bzip2/files/bzip2-1.0.6-nselectors-upper-bound-check.patch @@ -0,0 +1,30 @@ +From 13ca8fee0c897121ae79ae644a212418398dfea7 Mon Sep 17 00:00:00 2001 +From: Amin Hassani <ahassani@chromium.org> +Date: Fri, 8 Mar 2019 09:58:20 -0800 +Subject: [PATCH] Check for upper bounds of nselectors. + +Currently there is no check for the upper bounds of the +nselectors. Hence, a corrupt input can cause a segfault. + +This issue was discovered by one of our fuzzers. The actual error was: + +../bzip2-1.0.6/decompress.c:299:10: runtime error: index 18002 out of bounds for type 'UChar [18002]' +--- + decompress.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/decompress.c b/decompress.c +index 311f566..391552d 100644 +--- a/decompress.c ++++ b/decompress.c +@@ -288,6 +288,7 @@ Int32 BZ2_decompress ( DState* s ) + if (nGroups < 2 || nGroups > 6) RETURN(BZ_DATA_ERROR); + GET_BITS(BZ_X_SELECTOR_2, nSelectors, 15); + if (nSelectors < 1) RETURN(BZ_DATA_ERROR); ++ if (nSelectors > BZ_MAX_SELECTORS) RETURN(BZ_DATA_ERROR); + for (i = 0; i < nSelectors; i++) { + j = 0; + while (True) { +-- +2.21.0.360.g471c308f928-goog + |