diff options
author | George McCollister <george.mccollister@gmail.com> | 2017-11-14 14:01:05 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-11-21 14:43:00 +0000 |
commit | 715645a1be700e132a31aa9c40da1e66dd427ae8 (patch) | |
tree | 2f69440b509fd5100579c978d15dda66214df390 /meta/recipes-core/zlib | |
parent | aa650d4f5eb2b671e76d7c4da3ef080e26eed543 (diff) | |
download | openembedded-core-contrib-715645a1be700e132a31aa9c40da1e66dd427ae8.tar.gz |
zlib: Fix CVE-2016-9842
Add backported patch to fix CVE-2016-9842 which was fixed in zlib 1.2.9
https://nvd.nist.gov/vuln/detail/CVE-2016-9842
Signed-off-by: George McCollister <george.mccollister@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta/recipes-core/zlib')
-rw-r--r-- | meta/recipes-core/zlib/zlib-1.2.8/CVE-2016-9842.patch | 35 | ||||
-rw-r--r-- | meta/recipes-core/zlib/zlib_1.2.8.bb | 1 |
2 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-core/zlib/zlib-1.2.8/CVE-2016-9842.patch b/meta/recipes-core/zlib/zlib-1.2.8/CVE-2016-9842.patch new file mode 100644 index 0000000000..41b8d2a30a --- /dev/null +++ b/meta/recipes-core/zlib/zlib-1.2.8/CVE-2016-9842.patch @@ -0,0 +1,35 @@ +commit e54e1299404101a5a9d0cf5e45512b543967f958 +Author: Mark Adler <madler@alumni.caltech.edu> +Date: Sat Sep 5 17:45:55 2015 -0700 + + Avoid shifts of negative values inflateMark(). + + The C standard says that bit shifts of negative integers is + undefined. This casts to unsigned values to assure a known + result. + +Upstream-Status: Backport +http://http.debian.net/debian/pool/main/z/zlib/zlib_1.2.8.dfsg-5.debian.tar.xz +https://github.com/madler/zlib/commit/e54e1299404101a5a9d0cf5e45512b543967f958 + +CVE: CVE-2016-9842 + +Signed-off-by: George McCollister <george.mccollister@gmail.com> + +diff --git a/inflate.c b/inflate.c +index 2889e3a..a718416 100644 +--- a/inflate.c ++++ b/inflate.c +@@ -1506,9 +1506,10 @@ z_streamp strm; + { + struct inflate_state FAR *state; + +- if (strm == Z_NULL || strm->state == Z_NULL) return -1L << 16; ++ if (strm == Z_NULL || strm->state == Z_NULL) ++ return (long)(((unsigned long)0 - 1) << 16); + state = (struct inflate_state FAR *)strm->state; +- return ((long)(state->back) << 16) + ++ return (long)(((unsigned long)((long)state->back)) << 16) + + (state->mode == COPY ? state->length : + (state->mode == MATCH ? state->was - state->length : 0)); + } diff --git a/meta/recipes-core/zlib/zlib_1.2.8.bb b/meta/recipes-core/zlib/zlib_1.2.8.bb index 88f60611d9..eb38589b6a 100644 --- a/meta/recipes-core/zlib/zlib_1.2.8.bb +++ b/meta/recipes-core/zlib/zlib_1.2.8.bb @@ -12,6 +12,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/${BPN}/${PV}/${BPN}-${PV}.tar.xz \ file://ldflags-tests.patch \ file://CVE-2016-9840.patch \ file://CVE-2016-9841.patch \ + file://CVE-2016-9842.patch \ file://run-ptest \ " |