| commit | ef402577c2e3af6c3b967b2e4499b3796a37fde5 | [log] [tgz] |
|---|---|---|
| author | Oleksandr Suvorov <oleksandr.suvorov@foundries.io> | Thu Jun 15 17:54:34 2023 +0300 |
| committer | Tom Rini <trini@konsulko.com> | Fri Jul 14 15:21:08 2023 -0400 |
| tree | 1cec4013d7f74e96d7fdb2e85e2c1184c2238cb8 | |
| parent | edacf6a44d2383f9137a99ffdf61a24de4a47307 [diff] |
lib/zlib: Fix a bug when getting a gzip header extra field This fixes CVE-2022-37434 [1] and bases on 2 commits from Mark Adler's zlib master repo - the original fix of CVE bug [2] and the fix for the fix [3]. [1] https://github.com/advisories/GHSA-cfmr-vrgj-vqwv [2] https://github.com/madler/zlib/commit/eff308af425b67093bab25f80f1ae950166bece1 [3] https://github.com/madler/zlib/commit/1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d Fixes: e89516f031d ("zlib: split up to match original source tree") Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>
diff --git a/lib/zlib/inflate.c b/lib/zlib/inflate.c index 30dfe15..8f767b7 100644 --- a/lib/zlib/inflate.c +++ b/lib/zlib/inflate.c
@@ -455,8 +455,9 @@ if (copy > have) copy = have; if (copy) { 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_len - state->length) < + state->head->extra_max) { zmemcpy(state->head->extra + len, next, len + copy > state->head->extra_max ? state->head->extra_max - len : copy);