From nobody Tue Nov 18 10:37:54 2025 X-Original-To: dev-commits-src-main@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 4d9h024SVSz6GsDP for ; Tue, 18 Nov 2025 10:37:54 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9h02346gz3SPM for ; Tue, 18 Nov 2025 10:37:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763462274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aa1Zhjs/8BBRg/YrnlIdRKF4MhIUraOARQC+KcUd9zw=; b=lHMKoGqPAlurrJiaYH4spyvS+C8le8NVzyTWo1ZUpmOYxG6RkcIvURapd46gnFSGCDN7Pc MRGYD0osZwIS7WYE/uHOaesuMxpBcFF/uexL5LRlgyAjpBb4pCxSCrZu/pf9iDGaCRg7Lp mXJMzMwRqN+OxD8nFor+GVqIIK9D4V2DdWnnqAfk6u85y9sTGTfnhLMBcQDr+s6PPkw0Xj nUd0NlpMXS2eKlMgXfz0FF5TldeHiEIEbllgl2XJv7iKApbRxj7aNfGoJdmL7fLXUZcPx0 3HrXm9CVHTsVZ8yMcaqOOTAUSMfFsLKVZpeLidT48QXyuWllUdqpkDKLL/4/mQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763462274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aa1Zhjs/8BBRg/YrnlIdRKF4MhIUraOARQC+KcUd9zw=; b=H6erDtuFeE47xDjR6wwtdimaLDHeM3LElbzYW546pAZXIdh+vjY46ZQv0u4RVAVeh8mhSJ 3H6y07pHAsS3Jn6WeGEDE6+JlaENpVb492QRckqLPA0AZ9opx5kEHOb81v7/N9djSZsyWj vFsX05Kn5ecW5OQV8WNSwWMcgPUeX+w+qm1QtyYibQBvXFVO+p33mHjWG1KbvMb0Oe9Lkf J4I1bELPpU4sIqQjY9yLwa5VX12B6zQewXz2n/st7GQG429HZr3dlmmTmoa0Ee2Gq9ZL3L h712jsI2rwPvMyvoeWAOovcpbq5xKQaQo6vIyO8nEmQQOsysA23avP4UYqW9nw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763462274; a=rsa-sha256; cv=none; b=AVch3wDg+eHf23MYeIeFWE5ifI/ZmrVZty94altA63vVaeRATpweutTN0ofOsoxI9IqASM qfLKx25kSi+5PlfN+mkiToAypJGpAUA27/O4t6CI2nAqBbHMxhZJ9GS3DywPXD2o8e+EIN LKNA09YkwQ/gaosmjCIZXnMCtOwPzspZI/j+sHcm+I//IcfN3SXiH+avkcY9dPRhf0sV4h hjQd3u7+rXotpAqtWOnyqaq14zNTI5i1SCtUtCi6qVIaloUVMjEqa4tYEbsuDxNOIBSSeP jo21whJsa6gfEIuxxLUoj+Pqlq0u3DsQFZVFpNxCAImT1/n/BvHMgg2A7B6aRw== 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 4d9h022Xk8zr6R for ; Tue, 18 Nov 2025 10:37:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id c148 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 10:37:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Boris Lytochkin From: Andrey V. Elsukov Subject: git: 8012c61bef3b - main - ipfw: fix lookup dst-ip opcode List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org 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: 8012c61bef3bb19a48d8459b38b65e27d46c186c Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 10:37:54 +0000 Message-Id: <691c4c82.c148.3f4cef69@gitrepo.freebsd.org> The branch main has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=8012c61bef3bb19a48d8459b38b65e27d46c186c commit 8012c61bef3bb19a48d8459b38b65e27d46c186c Author: Boris Lytochkin AuthorDate: 2025-11-18 10:31:56 +0000 Commit: Andrey V. Elsukov CommitDate: 2025-11-18 10:31:56 +0000 ipfw: fix lookup dst-ip opcode Opcode handling should not fall through to the LOOKUP_DSCP type. Reviewed by: melifaro Obtained from: Yandex LLC MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53775 --- sys/netpfil/ipfw/ip_fw2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/ipfw/ip_fw2.c b/sys/netpfil/ipfw/ip_fw2.c index d15d7760d7f1..c27b6bc274fb 100644 --- a/sys/netpfil/ipfw/ip_fw2.c +++ b/sys/netpfil/ipfw/ip_fw2.c @@ -2120,8 +2120,8 @@ do { \ pkey = &args->f_id.dst_ip6; else pkey = &args->f_id.src_ip6; - } else /* only for L3 */ - break; + } + break; case LOOKUP_DSCP: if (is_ipv4) key = ip->ip_tos >> 2;