git: 289231c9634a - releng/13.1 - zlib: Fix a bug when getting a gzip header extra field with inflate().

The branch releng/13.1 has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=289231c9634adfc80b550b010847cb278fbd377f

commit 289231c9634adfc80b550b010847cb278fbd377f
Author:     Mark Adler <fork@madler.net>
AuthorDate: 2022-07-30 22:51:11 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2022-08-30 23:02:48 +0000

    zlib: 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.
    
    (cherry picked from zlib commit eff308af425b67093bab25f80f1ae950166bece1)
    (cherry picked from zlib commit 1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d)
    
    (cherry picked from commit dc3509f1aafcd966f3dd9226115cf94b691ff3c7)
    (cherry picked from commit 2969066f73fc67a614144ac09b9f3f5291937fed)
    (cherry picked from commit 10cc2bf5f7a592981ee00d22eb13e100beed1e64)
    
    Approved by:    so
    Security:       CVE-2022-37434
---
 sys/contrib/zlib/inflate.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sys/contrib/zlib/inflate.c b/sys/contrib/zlib/inflate.c
index 499626d87a1c..d4b4a0978656 100644
--- a/sys/contrib/zlib/inflate.c
+++ b/sys/contrib/zlib/inflate.c
@@ -764,8 +764,9 @@ int flush;
                 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);