diff options
| author | Petr Štetiar <ynezz@true.cz> | 2022-08-06 14:55:07 +0200 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2022-08-08 09:46:36 +0200 |
| commit | 7561eab8e86e1bfe8fda941439a99d4fb22a5928 (patch) | |
| tree | 58d9edb1021effcd122b4d75868328e6aa680f94 | |
| parent | 1f9d60314162249a4ace2e22e9d820bece75de85 (diff) | |
| download | upstream-7561eab8e86e1bfe8fda941439a99d4fb22a5928.tar.gz upstream-7561eab8e86e1bfe8fda941439a99d4fb22a5928.tar.bz2 upstream-7561eab8e86e1bfe8fda941439a99d4fb22a5928.zip | |
zlib: backport fix for heap-based buffer over-read (CVE-2022-37434)
zlib through 1.2.12 has a heap-based buffer over-read or buffer overflow
in inflate in inflate.c via a large gzip header extra field. NOTE: only
applications that call inflateGetHeader are affected. Some common
applications bundle the affected zlib source code but may be unable to
call inflateGetHeader.
Fixes: CVE-2022-37434
References: https://github.com/ivd38/zlib_overflow
Signed-off-by: Petr Štetiar <ynezz@true.cz>
(cherry picked from commit 7df6795d4c25447683fd4b4a4813bebcddaea547)
| -rw-r--r-- | package/libs/zlib/patches/006-fix-CVE-2022-37434.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/package/libs/zlib/patches/006-fix-CVE-2022-37434.patch b/package/libs/zlib/patches/006-fix-CVE-2022-37434.patch new file mode 100644 index 0000000000..dc84d3a1d3 --- /dev/null +++ b/package/libs/zlib/patches/006-fix-CVE-2022-37434.patch @@ -0,0 +1,32 @@ +From eff308af425b67093bab25f80f1ae950166bece1 Mon Sep 17 00:00:00 2001 +From: Mark Adler <fork@madler.net> +Date: Sat, 30 Jul 2022 15:51:11 -0700 +Subject: [PATCH] Fix a bug when getting a gzip header extra field with + inflate(). + +If the extra field was larger than the space the user provided with +inflateGetHeader(), and if multiple calls of inflate() delivered +the extra header data, then there could be a buffer overflow of the +provided space. This commit assures that provided space is not +exceeded. +--- + inflate.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/inflate.c b/inflate.c +index 7be8c6366..7a7289749 100644 +--- a/inflate.c ++++ b/inflate.c +@@ -763,9 +763,10 @@ int flush; + copy = state->length; + if (copy > have) copy = have; + if (copy) { ++ len = state->head->extra_len - state->length; + if (state->head != Z_NULL && +- state->head->extra != Z_NULL) { +- len = state->head->extra_len - state->length; ++ state->head->extra != Z_NULL && ++ len < state->head->extra_max) { + zmemcpy(state->head->extra + len, next, + len + copy > state->head->extra_max ? + state->head->extra_max - len : copy); |