From nobody Mon Nov 24 20:28:47 2025 X-Original-To: dev-commits-src-branches@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 4dFcq85DKCz6HnF9 for ; Mon, 24 Nov 2025 20:28:52 +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 4dFcq84dQlz3WHr for ; Mon, 24 Nov 2025 20:28:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764016132; 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=SM2IvSdhuok9fukrWiFgxdL8Q9BGRJ5OJBzHV+OA4oNj/jQJ4k8wlc1e60h74cQm2w8e0C RGGhH4aH86y94JE1Mx999wV1V56J8B3HXB5cKPgE+zwSUqq8IFMx3NqVPmW2hYpmHbzKl4 w/Ww1eYwVpCg7dfwgxUWg2xXWUtVjhReNSElBaACs8hYAh9FPjoB+D4gop+FoP7T/tuNkM 0SMlBUtH5732/yo4mOq25uyMmiuZ7P3Yst+yBRjdLjb361gwmeOGfcfTjg7Ym26MUEM9HR P2ILW3Bi4R80InfCJagpCRCZk9kEFhT1mECZIzKfibIqpTYy2ZjRgU4A/lcFMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764016132; 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=tQjOPb0DaV7/h5X170vuq5OLxcaEzkNzHss3PwsEszA90QyCNfRx99DQ5g9CpnVQmqo22I I5VGOFCX/8nQG+NPPX04DEA5h1BpR8PbHnXmX9ZvUkaJGfG1Si85jPKDDG6t/hUaQxiwT8 25pVthafw5BzcmYNyeVU+neCBBH+D0RD+EtlryWBv3RC0Vt3DoNhFNpWyK8Yt65959orkl qFiLdj6xsNJj/9R9p4nrTfeBel6YvOpbqn8HvTo+Fv39M3qXLFM4TjEtQjkJcV6SWbVJiR SCpX/CddnKafkfyNFNQDF9XIqX7ftrAdHqbnrdYpDU9lGbHYts/ZEfkWsLT5yg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764016132; a=rsa-sha256; cv=none; b=heSIpSjhpbK5PUhdzVtwCtUVXzF05CRQc1xkCTiZ50w6w0pHQ57AAhxCaHJ+dSgNxrPA73 z6NoP7jEp/DuREdQr3KKJHHegUm9LtSrDtPTMS5uTu541evn/mPq684tIqHw8aTE9Pa7fo o53viF4KXw9fv9tHypCpskXCmqchNXp7oRBLA6IKiMGyk4py/s2muPFYfv46ejF/zodVSp etswN5welUc9uFGrP/BcNXqhs+ywhD/qDqMPp3NO8b9MZF9KJTW3lH5QCEBe+BOnqkXICI o0pqp6oqPxpGKbGhRAcrI5E0GdA/U58suDHL9NorC1MQEL7qE1mvGn3CzoURKg== 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 4dFcq848KRzTq7 for ; Mon, 24 Nov 2025 20:28:52 +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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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;