From nobody Mon Apr 18 09:10:37 2022 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 E161111DF040; Mon, 18 Apr 2022 09:10:37 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Khh3x5VDVz4smg; Mon, 18 Apr 2022 09:10:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650273037; 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=8g6Zri/UbaOjaAB/OUM8ZXtymRgYz1IZDaH/J8J7imk=; b=qQJ0b5Pvep/WgaTh/IMcRX98OgAr5xjmwsRDt0eBHixEqbnKKx7kM03ZI+zTSFQd387hGp Aw3g3KxQvllfblUpbL3jwLUYU+NU+VbReUJ2Dj+KqgHlWpJXl5uCw0m/qyUNBkPzdxRkri DpuBnWJIip31IfCATpmsI/6T4FSiJoB+IcRpl+VJRxNrbnSIhqC0L94a5UXfHZYYEo/VH6 cmv/lzA33EpYr5Z7CEAxBQIkeLZkbq5M9EyZBtiXnCliYjkmnGKYBnAskts3WG02lxNL0H 7pissGLVo3AVmCi17e1/koJSwidt884gedgqQG17TzoHrP1A1b4zHnG3C7TfZA== 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 9CEB17961; Mon, 18 Apr 2022 09:10:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23I9AblS087529; Mon, 18 Apr 2022 09:10:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23I9Ab50087528; Mon, 18 Apr 2022 09:10:37 GMT (envelope-from git) Date: Mon, 18 Apr 2022 09:10:37 GMT Message-Id: <202204180910.23I9Ab50087528@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Andrey V. Elsukov" Subject: git: 17c9c2049004 - stable/13 - Fix ipfw fwd that doesn't work in some cases 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: 17c9c2049004038ed6f2dc23a64cb9f74411ec52 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650273037; 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=8g6Zri/UbaOjaAB/OUM8ZXtymRgYz1IZDaH/J8J7imk=; b=RGWfDB+TigHCI+tD/muo+DyQboZW/XrnmZ61Mf2NkkhRI4jXISNXpivFKjSUNgW3J+fE1K FoZnAtspGTM0BBUsOSJhwQ+1dSNWD7Xigd7kPg3CFr+00fkbqghIFkK1wBEubGO5pqpNB6 p9YTFIsW0IkZPFWSgISGwHjVHllYHnuAiWjixH+KvyVABSSPZ2NjNk3v0TbE7nR74cnXQY e2RM22iBVAOisN+ZhHO9YnZBJl0mhcrmmz0kyHssW8C511eIrtq85wX7cjmN8B6WAqML4b J9waJ6laGLC3U2VEbd71MJ74yZbWBA29ufGalXZXjhNs/7DGVN6VJCcnMW/t4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650273037; a=rsa-sha256; cv=none; b=tpDpI1aOljfZ1a8uOQF3dm2VCDiFGAQ8W6kvZ5FWSmF5n79PNd/KQRsPunwDlIC+UZeogD iIfIyh/U/I5RNi/m1JR3VfAQN/IyS9JrHHPk/UyIGFFS7A1CY9PHSwtyqHzVuw9rpjIgUC xHM/D8v6KsHcttEoiElrcjWuDzke/+6Ny6a6GGZgDRfTP5iUdk1wCcvq9P/d1UwXPH935W wuqOBXk4W+Df5ladF8f7vhCxOG4HMSGxwKvAMoEYLylZt45ont1aWEKyp9jCjYRVbi4kIT 2x66PfikTE7ilGVZMFQkQ5h0DmAU31ZOUS7G16iONtHFw1uYW19X2wDfGDW9cg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=17c9c2049004038ed6f2dc23a64cb9f74411ec52 commit 17c9c2049004038ed6f2dc23a64cb9f74411ec52 Author: Andrey V. Elsukov AuthorDate: 2022-04-01 13:49:25 +0000 Commit: Andrey V. Elsukov CommitDate: 2022-04-18 08:58:45 +0000 Fix ipfw fwd that doesn't work in some cases For IPv4 use dst pointer as destination address in fib4_lookup(). It keeps destination address from IPv4 header and can be changed when PACKET_TAG_IPFORWARD tag was set by packet filter. For IPv6 override destination address with address from dst_sa.sin6_addr, that was set from PACKET_TAG_IPFORWARD tag. Reviewed by: eugen PR: 256828, 261697, 255705 Differential Revision: https://reviews.freebsd.org/D34732 (cherry picked from commit 7d98cc096b995ca3bfd85277ed009b0f872c3e1b) --- sys/netinet/ip_output.c | 2 +- sys/netinet6/ip6_output.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index a23a38b08fa8..595957afe146 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -515,7 +515,7 @@ again: } else { struct nhop_object *nh; - nh = fib4_lookup(M_GETFIB(m), ip->ip_dst, 0, NHR_NONE, + nh = fib4_lookup(M_GETFIB(m), dst->sin_addr, 0, NHR_NONE, m->m_pkthdr.flowid); if (nh == NULL) { #if defined(IPSEC) || defined(IPSEC_SUPPORT) diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c index 3c8811ca1af9..f455c5ccbea2 100644 --- a/sys/netinet6/ip6_output.c +++ b/sys/netinet6/ip6_output.c @@ -772,6 +772,8 @@ again: ia = ifatoia6(nh->nh_ifa); if (nh->nh_flags & NHF_GATEWAY) dst->sin6_addr = nh->gw6_sa.sin6_addr; + else if (fwd_tag != NULL) + dst->sin6_addr = dst_sa.sin6_addr; nonh6lookup: ; }