From nobody Sat Oct 4 16:44:31 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 4cfBFq4nMmz69JXn; Sat, 04 Oct 2025 16:44:31 +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 4cfBFq2hRSz3Knd; Sat, 04 Oct 2025 16:44:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759596271; 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=z+WVr7KYx9fMdwhThMVqhUD9HINY0ElrdtEeOvq2TpI=; b=tcNTvyjUWbsrk8XiNK6WEosjTUTM0/LI4eWEEsbmUsriAartXSgKGZwzZ4eRJP6oU6rUnx xgDSUJlw23xAM8NRdiZ/t7SGwM6ahPy7C1Si/YS54iT8vJDro4W0S0n75m8BlK29qQCfXW xHVSQqME/mgIrDBE7TUnpWvfb6dd8sGusDfZ3EJ8CLNMY2FTDAoDK3hgluTi/sPfnX5paF 6Npyt+ldVVLhYCI6pO6WMmB9yodcIB5b4yVuIvfCsR1cBvoRRANJ867LQVHljvOFEfIGJ1 RzpcopAFxKXMuyL6GShyaC694yKCK3xTMKUScJkv5AW6eXtm01PRs3dmagq+gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759596271; 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=z+WVr7KYx9fMdwhThMVqhUD9HINY0ElrdtEeOvq2TpI=; b=B0lgBOBEMhV5BNTN3ssuaRBAdBr2XDW8t/f6YhesW/7ef9cBJKTJu9Z0AGTJHu/IDMPra9 0dbS41OCeg2n66doqb17/fZZ3sQZC7C7/VhZcfDB4o+ivdoj8NMjN7shzsNlZgj3rMfzWh +lcGo5xz7AMZT9VD0tl5W73FSTW2u4FSIGVVDkIe4lW6lL46SBN5zOxbs8eiGMYb6Nlqf1 AytfDyQNTq9mTsAki4MO6HAolcyCqH2LGbb+I+6LX9GZDlFeY8qfv0t23QwW1edxoBlYJR bh1sp53UmOEg86EwjQ3+VkKJgccwOgA0TSwYi3T1nVg+jv1nPblt3NeHwjMqlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759596271; a=rsa-sha256; cv=none; b=DA1SzyXABLGry6ygb13WId4xFqsmmqAbIZyjAwoyAvKaCmfKywiN/mfCFwgdagdk38cWHg HnPiO8SC3FwAatFwtVdjwDfXOnIfIpyBx2UhyIjxCDwYdNlYRNdpm8hQblli+eD1FihPSn P+NHh1D3B4sta+52/Ch5vMacOJI4jMnJqhLAZDPsRXfYkw0VMmdlrtRkJaJs4i9NjvJ+0R BMXmk1gpRFf9ht4f2CrLGJOiI+hGXZGHqxISSZokDdVLWaVBiOAGGmfDBbN9G9Tc03Pzwu N/sbQGcZoG3nf/8pIr6pAaRrXsVWzqzVLlLrQF+9A3q8CONQc7AgYKIQS3fbZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cfBFq2BjMzqbq; Sat, 04 Oct 2025 16:44:31 +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 594GiVkI058001; Sat, 4 Oct 2025 16:44:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 594GiVF8057998; Sat, 4 Oct 2025 16:44:31 GMT (envelope-from git) Date: Sat, 4 Oct 2025 16:44:31 GMT Message-Id: <202510041644.594GiVF8057998@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 6e605ed6df40 - stable/13 - EtherIP: Fix passing the address family from if_bridge(4) to gif(4) 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6e605ed6df40c91120f8d64924652f8565bc05f0 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=6e605ed6df40c91120f8d64924652f8565bc05f0 commit 6e605ed6df40c91120f8d64924652f8565bc05f0 Author: Zhenlei Huang AuthorDate: 2025-08-08 10:17:51 +0000 Commit: Zhenlei Huang CommitDate: 2025-10-04 16:43:20 +0000 EtherIP: Fix passing the address family from if_bridge(4) to gif(4) Given IPPROTO_IPV4, IPPROTO_IPV6 and IPPROTO_ETHERIP have different protocol numbers, then it is perfect valid to tunnel IPv4, IPv6 and Ethernet traffic over IPv[46] by the same interface. Since gif(4) has already utilized the inbound csum_data field to carry address family, also teach if_bridge(4) to do that, rather than checking if a gif(4) interface is member of a if_bridge(4) interface. Without this fix, tunnel IPv[46] over IPv[46] will not work when the gif(4) interface is member of a if_bridge(4) interface, aka the EtherIP setup, as the address family passed from gif_output() will be overwritten with the wrong one AF_LINK by gif_transmit(), and end up with incorrectly encapsulated packets. PR: 227450 Reviewed by: kp Tested by: meta Fixes: 8a0308722372 gif(4): Assert that gif_output() isn't called for EtherIP MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D51682 (cherry picked from commit f4744b8acb932fbb3e48b71d31b7cd585566b668) (cherry picked from commit aeb8f341ad20b5f49561fff688e8bee601b0e15a) --- sys/net/if_bridge.c | 6 ++++++ sys/net/if_gif.c | 10 +++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index e7c98958d2b1..5c0dad8b1468 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -2074,6 +2074,12 @@ bridge_enqueue(struct bridge_softc *sc, struct ifnet *dst_ifp, struct mbuf *m) } M_ASSERTPKTHDR(m); /* We shouldn't transmit mbuf without pkthdr */ + /* + * XXXZL: gif(4) requires the af to be saved in csum_data field + * so that gif_transmit() routine can pull it back. + */ + if (dst_ifp->if_type == IFT_GIF) + m->m_pkthdr.csum_data = AF_LINK; if ((err = dst_ifp->if_transmit(dst_ifp, m))) { int n; diff --git a/sys/net/if_gif.c b/sys/net/if_gif.c index 022896c17965..bbb633fb7d3f 100644 --- a/sys/net/if_gif.c +++ b/sys/net/if_gif.c @@ -311,10 +311,7 @@ gif_transmit(struct ifnet *ifp, struct mbuf *m) goto err; } /* Now pull back the af that we stashed in the csum_data. */ - if (ifp->if_bridge) - af = AF_LINK; - else - af = m->m_pkthdr.csum_data; + af = m->m_pkthdr.csum_data; m->m_flags &= ~(M_BCAST|M_MCAST); M_SETFIB(m, sc->gif_fibnum); BPF_MTAP2(ifp, &af, sizeof(af), m); @@ -354,6 +351,8 @@ gif_transmit(struct ifnet *ifp, struct mbuf *m) break; #endif case AF_LINK: + KASSERT(ifp->if_bridge != NULL, + ("%s: bridge not attached", __func__)); proto = IPPROTO_ETHERIP; M_PREPEND(m, sizeof(struct etherip_header), M_NOWAIT); if (m == NULL) { @@ -404,9 +403,6 @@ gif_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst, { uint32_t af; - KASSERT(ifp->if_bridge == NULL, - ("%s: unexpectedly called with bridge attached", __func__)); - if (dst->sa_family == AF_UNSPEC) memcpy(&af, dst->sa_data, sizeof(af)); else