From nobody Sat Sep 27 15:13:50 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 4cYrZQ6jRlz68D68; Sat, 27 Sep 2025 15:13:50 +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 4cYrZQ4Sn1z4497; Sat, 27 Sep 2025 15:13:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758986030; 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=fjtsx9b/s3c4y94tu4eSTrkos/4Z/NbFN1K7/RgiWA0=; b=dnd97Qco4KA+awx1uztUnHFISxjTR2+uSKRSK50jklSPBfDXwN5HAy3U9jm6FSSb79x5I9 R1zjeAlEeHTjXfcK15FYwEKzt7YdcfBkWS4+nFLLS4OBLWFQKQuhSQwktwxf8mtC7jAYbm 8HbkxUTS+2vBJnVQJRDVCDTksWa0g+vcrlPyctuMez29TZ02soLvcx3JUyZypD30cu/O2R 864kMe5unX1Q8phmnPON3LYjIdJOho9CBTfNLdFYencNhSyxYWa9O7gK8qyXYRwZv8KaQ0 2Az14SFaMz0Q2VneJMWjtlag4xO6bH6rPJ88y6GgDXI7tSd1jg2Bp/6p+86elw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758986030; 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=fjtsx9b/s3c4y94tu4eSTrkos/4Z/NbFN1K7/RgiWA0=; b=CAauPNJGYK4luQM8ze+ssdB0Rx1zp0Qdkpz6SieMb/t+SNJ0EXutD/Ce3LEWZRjUzZa5E5 SEAU0IvGixtMXiMZK+Qt6fVSjt5JzC2bsDPGDpm1gpCrPHgQTXp2bfpGA5+1RLXQpk57Id /0CS5gMJH/RFYFIVZHfmX2Kp8ZGZS3Ya7Fjlh9mjs+/K5Y2zcR14D8BfWbaBnBlCSA3g+m wDcNeyD3k5YTV3JgAoQDXVYck2AExGYQeOBGp7vFlA8gsm4WEztfwyYagsPyNyEfWHJhNb x9DwWxDbNADRZcyQI62FLX01v7rsX6WYQHsJl94yUIMQtr/E7n42KfcdFWFQvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758986030; a=rsa-sha256; cv=none; b=N48VECGEZuL5AUqflyQNp2CPjjztexD/riFFiFvGi0Vtv0PSbFHPp3XyAjjEaQ//0lH8Un d06GA7Uzjmv5q0h7m6FmpWLX3ydDp01prfVXKTrFp7IXWLvyf9nTWwQP8cFXl0TgodRoYO DhqDBrURVrvDzUamV6Q+5XsyLPXgHAXSY9jw74H66cQRlks7IXuAGHWXMXLc3tcPY85VWX igq7KikaDGJ6VHyUrsjW7KNHEL4mJMYnodPCN3K9deZY2rIiFS4Og1DHie7rB0tCqXPa0F sbOpE7dliqLhRlHwzT1+5J6S6PbmCGaTOU3nunjDkexErvcGy+WiIlyoOJfUdQ== 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 4cYrZQ43rLzfy8; Sat, 27 Sep 2025 15:13:50 +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 58RFDomb082910; Sat, 27 Sep 2025 15:13:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58RFDoQi082907; Sat, 27 Sep 2025 15:13:50 GMT (envelope-from git) Date: Sat, 27 Sep 2025 15:13:50 GMT Message-Id: <202509271513.58RFDoQi082907@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: aeb8f341ad20 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: aeb8f341ad20b5f49561fff688e8bee601b0e15a Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=aeb8f341ad20b5f49561fff688e8bee601b0e15a commit aeb8f341ad20b5f49561fff688e8bee601b0e15a Author: Zhenlei Huang AuthorDate: 2025-08-08 10:17:51 +0000 Commit: Zhenlei Huang CommitDate: 2025-09-27 15:11:34 +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) --- 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 035ba0f0806c..3a470454db27 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -2140,6 +2140,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 ef64c15074ed..272ab214a788 100644 --- a/sys/net/if_gif.c +++ b/sys/net/if_gif.c @@ -312,10 +312,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); @@ -355,6 +352,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) { @@ -405,9 +404,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__)); - /* BPF writes need to be handled specially. */ if (dst->sa_family == AF_UNSPEC || dst->sa_family == pseudo_AF_HDRCMPLT) memcpy(&af, dst->sa_data, sizeof(af));