From nobody Mon Dec 02 09:44:02 2024 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 4Y1zPv3tbYz5fxvc; Mon, 02 Dec 2024 09:44:03 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y1zPv3KX7z4LWx; Mon, 2 Dec 2024 09:44:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733132643; 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=IYBnFhFtn/1ZjRczYqdPCI+SrRTluqhwbBi70xPaPq4=; b=iCn98bDfOYjCjnulscRRtY7YTtPEaiahzgniOjtehOm/lksf2V3kmK59K5K/hThXYNjI/f BAK5zVz2/5WlQRNXO+rtNGgMDwLNxe02TtLfc5Uxo36AOaXi/6BUzvWSiW4dBUY0JrdsmX w6UdD2quNcBfsbL6jbAxwuRSYG7ZY6q/tLFRCWphnkaN9YkDKoP8yZn3toyEtqEw2Q1K4R 8aR1RtS1fbJWONqPLiYHw0nphT7+ablCRK0oEqJoBNBdkiueRfbPnStNclpHmy8DEv5m/l p8YNDBrSyLluIE/RCp8U6ZaspuYBtcxpvxGa3NAW1pUx8RkL8OnLEP+tiM6E/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733132643; 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=IYBnFhFtn/1ZjRczYqdPCI+SrRTluqhwbBi70xPaPq4=; b=SlRQVHdsLqMcehbpAFJBk+NE7Oo6uEfZc+FFqs6tblmy62HaByr2LUbUZDI2NYirdJJlxW 3M6nfUF9Dvj12KX6ePAvGaTbXCxAzr77EhhSWYbQeZ292XbQdP3+nNumrRkl1eFfy8PcLx JvkOPkhv9wJj05JQfkElZhvycEw8IYyenB1SKLV4nJjTPgsIeSZCTFNSZdWsZi+9xHBur9 wKWXf6nLTXUnuWAh8Ixz9qJq5tT0mziVPFlIQw/3jcUKIdrWevCRmJES2h9NVMi7OrrkQe uKJbR/rMSMLk5bvrR4WtNNg/xebwuDCjFhXhN0Bg4aFfNUMzYXqpPAeXpxeKvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733132643; a=rsa-sha256; cv=none; b=HsGvSduqbGlPmKSDtvusIE+l14Anj23PPQKvYUycRl/YukRA7p1uc0lq6niUqBOl1LMPOi xgvVfxO76wg5y1leoxQvFq3FQz1VtL7Cl+bNdMpT9fmOu0FNE/1BqIZ58NEgvqUz+7ohk8 emAbRa/vczB3z/Rdro8mY1FhMq0oduqTe13ld5h2xsOebbQ6Pb+JVyrJDc3Uc7hWNldUIj oYkRoSgUrDaONuGxTNJKr15D5q0kONbnxBaM1hcad5VlfbwpC0d+rnJgeRwZwj+uvBOD/X ZHshytvVd9bMwC5S8xhkvNBPpRBuIvlpLziBpucBKvpGJlEDdN4D4FYuqzYLhQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y1zPv2mTpzXYC; Mon, 2 Dec 2024 09:44:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B29i2Ti021574; Mon, 2 Dec 2024 09:44:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B29i2Um021571; Mon, 2 Dec 2024 09:44:02 GMT (envelope-from git) Date: Mon, 2 Dec 2024 09:44:02 GMT Message-Id: <202412020944.4B29i2Um021571@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Andrey V. Elsukov" Subject: git: ff1aec7ccb54 - main - ipfw: do not reset fwmark when one_pass is disabled. 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: ff1aec7ccb547b778c7fb2263ecb50ceeea971f5 Auto-Submitted: auto-generated The branch main has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=ff1aec7ccb547b778c7fb2263ecb50ceeea971f5 commit ff1aec7ccb547b778c7fb2263ecb50ceeea971f5 Author: Andrey V. Elsukov AuthorDate: 2024-12-02 09:41:11 +0000 Commit: Andrey V. Elsukov CommitDate: 2024-12-02 09:41:11 +0000 ipfw: do not reset fwmark when one_pass is disabled. Fixes: fc727ad63d3f8 MFC after: 1 week --- sys/netpfil/ipfw/ip_fw_pfil.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/ipfw/ip_fw_pfil.c b/sys/netpfil/ipfw/ip_fw_pfil.c index 4dae28aa0544..ddd8e00316b8 100644 --- a/sys/netpfil/ipfw/ip_fw_pfil.c +++ b/sys/netpfil/ipfw/ip_fw_pfil.c @@ -127,6 +127,7 @@ ipfw_check_packet(struct mbuf **m0, struct ifnet *ifp, int flags, int ipfw; args.flags = (flags & PFIL_IN) ? IPFW_ARGS_IN : IPFW_ARGS_OUT; + args.rule.pkt_mark = 0; again: /* * extract and remove the tag if present. If we are left @@ -144,7 +145,6 @@ again: args.m = *m0; args.ifp = ifp; args.inp = inp; - args.rule.pkt_mark = 0; ipfw = ipfw_chk(&args); *m0 = args.m;