From nobody Mon Nov 24 20:28:47 2025 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 4dFcq356Hgz6HnNs for ; Mon, 24 Nov 2025 20:28:47 +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 4dFcq34Pybz3W28 for ; Mon, 24 Nov 2025 20:28:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764016127; 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=UB2emz1KRTiWAoH8WtwCa+5Hp7N9oVyRAv4TnV9YFsQ=; b=mpwPjuhYeYFLE/QrYjn6pAIEBY+7VZGaMkG+9g1XL+dmQYg3jdjGQlNrtukFrZJ8VWoFjZ Qzk9U9OOzsh2kkHGvx2yT5H/e9MJ/sjHuXgfNwwXpPq/uS5Tv5hGLjdBJrHOwxs6RyIV0j BRP8Pn+m0F1+Roj0ED2w69dZ7OGfKhfGphhsxPERDdwtjTPIPydDzl9j2iF9Gx24XjzdzR jpCCmV8Kooy2NQx7GciGB0LGy3itKrlr/6K2C/ZrQiVDsLbzEsYivjPRzijEvS4LMOxtit slf2Gk3qnYAh+sujlhqdF0QIH25OzpKsjpDW3uv8fLPUo6q2BYP7iCqUqrNePQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764016127; 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=UB2emz1KRTiWAoH8WtwCa+5Hp7N9oVyRAv4TnV9YFsQ=; b=j7t+xa3d5uIVZWIcF6v//1hwwOYJ2p1DZfid0zUrlkuTBrXGZwC16V461LpMdThLLqWagh PC4OPvd0U0YWQoNJ4e1Gs7RGtvwna6pvgYa8dhiRwPB8PYHZW/6BANyJ94/DHVtp8ysF4I OkWUPD+n3KwX3dY9LlqkMS8zCeaD0mKIUlhsZSos5msrwvPIm49iXYbKOqLdBEd1MFSk/i gBaL5vexis5BMvq4Wm7H4rQ/M98zjXmZTVShBZDzoQPCehvCSLk3Y1a1iiZatQrfQe5Hx0 bhwzOIPJQkpe3hagmhJ6E1HJwt8IZRDMgYXCrjSnXkzwysqFvL19g0DuOROkzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764016127; a=rsa-sha256; cv=none; b=DvBvTKNojti7eg4DuwTSZYBl9v/vZ+JY12/mB5/AKsIvK5u2pfQV3I43zOLTkSXzlxNSDH cv+6AV21LyQpe24nrDlwFSSHR+bYJ3Sjjnq8BkvguQ8A+9P5TSoIOIUvsNjrz6ScxUZ/ld zI6kb6E9NCTeNUJtuE1gSp2tkNPTHPS4AH0rAmIstjruNoFe9Ck0udaW1uGo/ylo5jckO+ BrvPXHXY6/oOEj+/2yLcZYH6fYftOjOSx2SWP1WJM4gXp1jL1L98XbRnRRluDByeP1kaBp PEabB3GIyx4jifEcfqteZvecoQEmeJ0CGrobfDrTqpnX1K6ua1erWiKjdaLfMA== 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 4dFcq33ztQzTq6 for ; Mon, 24 Nov 2025 20:28:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 29a8b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 24 Nov 2025 20:28:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Boris Lytochkin From: Andrey V. Elsukov Subject: git: ff3c48a64fe2 - stable/15 - ipfw: fix lookup dst-ip opcode List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/15 X-Git-Reftype: branch X-Git-Commit: ff3c48a64fe2f9c1acf531e088dfb14e31404bae Auto-Submitted: auto-generated Date: Mon, 24 Nov 2025 20:28:47 +0000 Message-Id: <6924bfff.29a8b.6dc58e0d@gitrepo.freebsd.org> The branch stable/15 has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=ff3c48a64fe2f9c1acf531e088dfb14e31404bae commit ff3c48a64fe2f9c1acf531e088dfb14e31404bae Author: Boris Lytochkin AuthorDate: 2025-11-18 10:31:56 +0000 Commit: Andrey V. Elsukov CommitDate: 2025-11-24 20:28:09 +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 Differential Revision: https://reviews.freebsd.org/D53775 (cherry picked from commit 8012c61bef3bb19a48d8459b38b65e27d46c186c) --- 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 b59d8d08bf80..2b7f38d2e9a6 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;