From nobody Fri Oct 16 03:45:09 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4j5W6g1W6Xz6vnkh for ; Fri, 16 Oct 2026 03:45:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j5W6f63r8z4r1w for ; Fri, 16 Oct 2026 03:45:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792122314; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8sAWPitfEUvAuCYOk+cSnMwFwmkNY6LmK1aNEwpr7TI=; b=QuDjgg97gfTLucha0o4vfo5z5SAvXtidgSqhoD9Re1unYp8rl0n+MbEf4zuNoFeZk2f41s I+DfQ22Htg3wLuMWZN4R/E1b/dtDlj3whz8pGf+LUH7o1kmKalL36K4tl6rPf32PM8fmJ1 Weohu6uKCi8a4dvbRyBWUJBz4prJ4RirFf2EMsh5Nck3iZ/fby3dYeJskrRKZAisBB/FLM T7TRgKyn1TaoVirKuBz+/yh1lIuZ6XI3sPcHT3CVpyDnEKp8YCIKF3FBmd2pzdpbM/2AjT a4KobXiAaqtjMICPthbIbrC/X8EfpFSotDL09FQFYCN8GI8e/+u6FvBsSBC6Bg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792122314; b=ZKOCfRE++2pqVvFqiC5JGcGzz014KkwRB2Wh4avLsi41DDaTm/rWt2s0zATgJoJymIz2l6 RIRDcjFSF4Rjh02vzDmSTiAayh9b1BQNSaxOaGlEn96QsMdfbmSJuGIKk52z63GkPlSI85 4T+kbNjbA5TdA3w9e9QEketyQUnYrSNTcTG3vZiIaErcTiKEsI2WiW/yn2CEvoGlrutyLt 8ZJqxw5JcfHgHUw9wwhIQbMeyEWCok5o6kJTpK/TEAiY4pNappM8Za2GbNaQF7PurzbVIn I2589ZnomeG4hMNiTfD0j347SBUyRGVjH3AaOiBjn3Y/H5NBwdKa0VFWy3Ah0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792122314; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8sAWPitfEUvAuCYOk+cSnMwFwmkNY6LmK1aNEwpr7TI=; b=D1g6X7zcaNpneKC93HPLjbHPiuM+KpcTd/TTqCb57Kyxvyg8gYqs49z6Bd6oRUVbH6Uuub dBwhSJcN07e+pTPTQfo93A3YJjz6BVoeqtc2+HOnublfJ5+kichd0g7GZgyZFn/BOgD4q0 I1edMfsXYw0IP1y3LE5LV8uk146LPJkRgjiiMPFLzZEUJj3BLCLqZ4orrR7fLYuXZEfZHv y2kyKOEzY0s699dDNx5aMd0cBWu1gthfGhe/8BN1zwJl+cqE2sspPeDldICltqWdG0zsd0 ij2M46Ogy4Cnm22w379+hJzcogwebzmAUHsA6euD6iATh+2dvqPv4B3AHBTGLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j5W6f4lGwz12qv for ; Fri, 16 Oct 2026 03:45:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37c87 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 16 Oct 2026 03:45:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 03d26200a599 - stable/15 - MFC: MFV: zlib: Fix buffer overflow bug in non-blocking gzwrite. List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 03d26200a599dfab5dfe4a1b5f1d2356d6210ef7 Auto-Submitted: auto-generated Date: Fri, 16 Oct 2026 03:45:09 +0000 Message-Id: <6ad19dc5.37c87.77f4370e@gitrepo.freebsd.org> The branch stable/15 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=03d26200a599dfab5dfe4a1b5f1d2356d6210ef7 commit 03d26200a599dfab5dfe4a1b5f1d2356d6210ef7 Author: Xin LI AuthorDate: 2026-10-13 05:49:35 +0000 Commit: Xin LI CommitDate: 2026-10-16 03:44:46 +0000 MFC: MFV: zlib: Fix buffer overflow bug in non-blocking gzwrite. DIfferential revision: https://reviews.freebsd.org/D60695 (cherry picked from commit 7fe1d8abad3f55f127634c1ada7718bc1982089e) --- sys/contrib/zlib/gzwrite.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/contrib/zlib/gzwrite.c b/sys/contrib/zlib/gzwrite.c index b0da973cc016..f2fefb94346c 100644 --- a/sys/contrib/zlib/gzwrite.c +++ b/sys/contrib/zlib/gzwrite.c @@ -243,8 +243,11 @@ local z_size_t gz_write(gz_statep state, voidpc buf, z_size_t len) { n -= state->strm.avail_in; state->x.pos += n; len -= n; - if (ret == -1) + if (ret == -1) { + state->strm.avail_in = 0; + state->strm.next_in = state->in; return state->again ? put - len : 0; + } } while (len); }