From nobody Wed Oct 28 11:20:13 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 4jF4fC0WFGz6xJlM for ; Wed, 28 Oct 2026 11:20:19 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jF4fB6PBLz3MVW for ; Wed, 28 Oct 2026 11:20:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793186418; 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=mfPO8Xs+vUUNhmxjXpEvB4MAq8yPp40Fvq3es8cJ7IA=; b=Qsoy3qup2Whm3lfq/7mcP0fjwvUnoazzdMhy5BxCoiOTlBWXMpSJSUDZIfsCKEwYaAjYyq Ycg1qDuylTSuw5EeuaYHipz7Zml1mSLAZVdYOFIQu7KBUUsYOB9RGVTFw9+6SOi4cUyU89 mBrgW/Maijr4wBvEWWTRac/u9dUZdOENV2ep5evKwCuRU1+pCGxit5vI/EZjtYXVAiH6Ah v4BV05KPKWvMGXJZsJKpJJMD9gUJ+QmxEdyeHihFVf18vh7bF/eMYllzgHN1d8pG4lrimE 9PlproEBuLuPLZza67z9LOvBRGJ71SGPi4TnKW+R5W3l+thVLGyNAY08hQ144g== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793186418; b=gFh/aRPyOIdRqHlk2d0v5PqJkPWmLZm8pa3+gHeIiHQRR7Vc/lnQj0jSEzNYkVsODjJbAE cRJFqY2uds3yj80g+JDjC+3PGF3xPP0OCgfIFWXjAUVVkCXREafGBkDr7VETzyeJN3rRiK El1qCrDQ8iY+3QsqdH4sfmYAH82GhXX3NmDjEysJTv4LTvWfAn4XdAIAl2dCc1N53AIgCK QL+hKoLizKo/en1uev+oWfSQQUoMETxTpcwWneTtxTAbK3oRTLgNsJaRAC2lk1CP5ji9Wu 7VomHnbNya108I6dD9HWzLC2uoFFUsVyVpuWvF921hwdkPMYISavI2pTXxpwGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793186418; 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=mfPO8Xs+vUUNhmxjXpEvB4MAq8yPp40Fvq3es8cJ7IA=; b=BIGi/RF/ad/xOORNZBFZWGLBSwXtn2hlBPlHbVDlVbcFhcSJslYXO+D+ZZDqutuwJLuFhP jiwyG0EYKsUDtARotKPWwDO4TAZH8G/9NghBiFMP27S1OPwCNopCnlNxd+74RPOhAk8KuC nJzxpnWUh9vplbo5g7m/yG+ELAA9mfcuOJI1nP6IIOCDfbcH9wzmb/iuNEZjQgPiB+O3W2 aRzuLG54ZJhoE0aiY11tLnUzKNqO76gbgHJcvf28xuwO91/yBOVvDmM8mirmudxsrWNs0U 00ozLDTwIR4ksSB6200BhOAohDrAeAgesPKF+XjrT46Yii1XtF4lv5r9mKQCfw== 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 4jF4fB63wgz14xg for ; Wed, 28 Oct 2026 11:20:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30146 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 28 Oct 2026 11:20:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrey V. Elsukov Subject: git: c6b08de0e4c7 - main - ipfw: fix off-by-one error in bdel() 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: ae X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c6b08de0e4c797929f4609d86395d494ac695c68 Auto-Submitted: auto-generated Date: Wed, 28 Oct 2026 11:20:13 +0000 Message-Id: <6ae1da6d.30146.660e5ae@gitrepo.freebsd.org> The branch main has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=c6b08de0e4c797929f4609d86395d494ac695c68 commit c6b08de0e4c797929f4609d86395d494ac695c68 Author: Andrey V. Elsukov AuthorDate: 2026-10-28 11:13:53 +0000 Commit: Andrey V. Elsukov CommitDate: 2026-10-28 11:13:53 +0000 ipfw: fix off-by-one error in bdel() After deleting an item from a sorted array, bdel() moves the tail following it, but the size of the data to move was calculated with an off-by-one error, causing memmove() to read one element past the end of the array. This can happen when the table is full for ifidx or numarray algorithms. Obtained from: Yandex LLC MFC after: 1 week Sponsored by: Yandex LLC --- sys/netpfil/ipfw/ip_fw_table_algo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/ipfw/ip_fw_table_algo.c b/sys/netpfil/ipfw/ip_fw_table_algo.c index 515c420ed663..23642c657227 100644 --- a/sys/netpfil/ipfw/ip_fw_table_algo.c +++ b/sys/netpfil/ipfw/ip_fw_table_algo.c @@ -2063,7 +2063,7 @@ bdel(const void *key, void *base, size_t nmemb, size_t size, if (item == NULL) return (0); - sz = (caddr_t)base + nmemb * size - item; + sz = (caddr_t)base + nmemb * size - item - size; if (sz > 0) memmove(item, item + size, sz);