From nobody Sat Sep 27 15:13:53 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 4cYrZV6WSyz68Dfb; Sat, 27 Sep 2025 15:13:54 +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 4cYrZT72BJz4432; Sat, 27 Sep 2025 15:13:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758986034; 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=EtGfVD0A1YBxYRHEL6s5ivXLps/c5PJnAFK/NFPWZ8c=; b=HT9F3us/WMfQIT/JQaVJQHIx6pbm5o2ui27AaeOqB/7afWloJi32Pti0c+Z9br0PNIeTME Z5qW8o9tGX7M6pOEjOFYEYRBSUBTqLdFgxpiJcw9mMxHCxMXV4IVYm1Iq9JOr+7it5rWbQ 5CGr1v2kgqSGdbDTMUNNtwkmpRRV2CRi17wVTjDB7iNlBQ2nNZRbmq7owRyn+99q4uvNvn x58xJneWoTnDe9IR38YorD5enSjf+jw/a+R8kWVNxhiL7vwTaw7GMxbes/VEwbg0eQ5Zcx xhDQ6vv6Ug/i802xUcrXrdWhtsyXzrxd2+htoLrpDzSkMMDFeB0pFFF1POHj5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758986034; 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=EtGfVD0A1YBxYRHEL6s5ivXLps/c5PJnAFK/NFPWZ8c=; b=aXV3Kvzk0YwzZAvWwZuzxXDADr3d4LmY8MpXB2n3BAs6koPNAu95HXIT2MocajeKjLtzLD QwEXtwV7H6yUpvWGIVXZJjzleWmkO3dsZEe4QukzqY7Fv20/NaCn81EnbgZvqwUvZsxrgI 8P9jnTRNtDZSauJLyhTwV74LMMM/8z7NtyVWKY2/plQI0xi8djqmPjJw4cxxrNMCCyvOeQ QarZnsOYzNRjz+RnGQlHBial60EZxl/fPTv4NZ8AkW7lRuQsVX9QyB30nEU37ef8ILHhvR uGSlRhOshFoHWk1R+DlDzUYSQqsR9QMjMPx6WZ4fRDwKsATb//RSGazm3YcS3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758986034; a=rsa-sha256; cv=none; b=wGhYP4m6sVSZOK4KRfaU0rJ/zwQwBa+BBQDwRLqC5Ii3crJOoZdzxN5mSIqbQdZqRQY4fK DvueDh0MnifLF2X/gLmNxdbgvbbbrN+eMqL4djbs32eNyys6NX3tvNtNdmFAq0CB4W5R20 /XaEUSmTO9q1/N6OIPF8yjJ9OBaxYlMLAfdjk5vBc4hzCowJlM+RbdgbDV8WGHqRVR4u44 DJ53hijKk+1mH/9jS6OV/MGs8+/5ziYlLsc+i1P5AwGfjUzuWgOcY1I3VB7MSezibrCTGk Pk/YB0rJFDDkusZ1qB9bXlXo4JOwOAmIPgza0vHzQucWaGFHg00zprcgTZfc+Q== 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 4cYrZT6TZTzfs8; Sat, 27 Sep 2025 15:13:53 +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 58RFDrEu083019; Sat, 27 Sep 2025 15:13:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58RFDrx8083015; Sat, 27 Sep 2025 15:13:53 GMT (envelope-from git) Date: Sat, 27 Sep 2025 15:13:53 GMT Message-Id: <202509271513.58RFDrx8083015@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: 52dbbe3f37ff - stable/14 - bridge: Fix adding gif(4) interface assigned with IP addresses as bridge memeber 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: 52dbbe3f37ffda10751c3146b9ec0e11772fd5b6 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=52dbbe3f37ffda10751c3146b9ec0e11772fd5b6 commit 52dbbe3f37ffda10751c3146b9ec0e11772fd5b6 Author: Zhenlei Huang AuthorDate: 2025-09-01 10:14:22 +0000 Commit: Zhenlei Huang CommitDate: 2025-09-27 15:11:35 +0000 bridge: Fix adding gif(4) interface assigned with IP addresses as bridge memeber and fix assigning IP addresses to the gif(4) interface when it is a member of a if_bridge(4) interface. When setting the sysctl net.link.bridge.member_ifaddrs to 1, if_bridge(4) can eliminate unnecessary walk of the member list to determine whether the inbound unicast packets are for us or not. Well when a gif(4) interface is member of a if_bridge(4) interface, it acts as the tunnel endpoint to tunnel Ethernet frames over IP network, aka the EtherIP protocol, so the IP addresses configured on it are independent of the if_bridge(4) interface or other if_bridge(4) members, hence the sysctl net.link.bridge.member_ifaddrs should not have any influnce over gif(4) interfaces's behavior of assigning IP addresses. PR: 227450 Reported by: Siva Mahadevan Reviewed by: ivy, #bridge MFC after: 1 week Fixes: 0a1294f6c610 bridge: allow IP addresses on members to be disabled Differential Revision: https://reviews.freebsd.org/D52200 (cherry picked from commit 9764aa1ccad08a7ec53ed9b80741b9553f3fa4e6) --- sys/net/if_bridge.c | 6 +++--- sys/netinet/in.c | 4 ++-- sys/netinet6/in6.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index 3a470454db27..0f4ec01fb392 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -1328,10 +1328,10 @@ bridge_ioctl_add(struct bridge_softc *sc, void *arg) #endif /* - * If member_ifaddrs is disabled, do not allow an interface with - * assigned IP addresses to be added to a bridge. + * If member_ifaddrs is disabled, do not allow an Ethernet-like + * interface with assigned IP addresses to be added to a bridge. */ - if (!V_member_ifaddrs) { + if (!V_member_ifaddrs && ifs->if_type != IFT_GIF) { struct ifaddr *ifa; CK_STAILQ_FOREACH(ifa, &ifs->if_addrhead, ifa_link) { diff --git a/sys/netinet/in.c b/sys/netinet/in.c index 21555a0714b6..75ff9066875c 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -503,8 +503,8 @@ in_aifaddr_ioctl(u_long cmd, caddr_t data, struct ifnet *ifp, struct ucred *cred /* * Check if bridge wants to allow adding addrs to member interfaces. */ - if (ifp->if_bridge && bridge_member_ifaddrs_p && - !bridge_member_ifaddrs_p()) + if (ifp->if_bridge != NULL && ifp->if_type != IFT_GIF && + bridge_member_ifaddrs_p != NULL && !bridge_member_ifaddrs_p()) return (EINVAL); /* diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index 0e2c19efe9d5..b6ecf24a73cd 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -1238,8 +1238,8 @@ in6_addifaddr(struct ifnet *ifp, struct in6_aliasreq *ifra, struct in6_ifaddr *i int error; /* Check if this interface is a bridge member */ - if (ifp->if_bridge && bridge_member_ifaddrs_p && - !bridge_member_ifaddrs_p()) { + if (ifp->if_bridge != NULL && ifp->if_type != IFT_GIF && + bridge_member_ifaddrs_p != NULL && !bridge_member_ifaddrs_p()) { error = EINVAL; goto out; }