From nobody Mon Sep 1 10:16:08 2025 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 4cFlBw6zbnz66f2F; Mon, 01 Sep 2025 10:16:08 +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 4cFlBw54J5z3F0c; Mon, 01 Sep 2025 10:16:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756721768; 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=JFWdK/BkHp2NFHzqGzNvA2kMWKHdml8w7M3FXg6gwCA=; b=ImVmNwHQkrEnwjqLSclAX7I6IOKxquEgD1EPvH7kdWnqjYN3JxT8vUoqZ3Odoc/bbQjxvb x0JMVwXfnZil6BcA94KLMhcHZIhC33iD+u5vMs8P+n0WP2es2LyUbE2PrEyW0Gl41HA/rI iLSg378MuRA8E/GT8MdHg1GtKy8XqbxYj3un6JEW629n1Yjjfoprcn+ba9G8ihPO5Tuv5h lCDQkmL4oHwInK7f8x9shkO0Uwn6Q4gGsgqVioLO4Md5DfXhyTNXsF/UP4z22lBu6QUI9Q Xyt/svWkiBfWF0gZ2RPZITsVy+VAec+3RpcNeRkiIo67sYAvoGQ4WjPF2V6Xxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756721768; 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=JFWdK/BkHp2NFHzqGzNvA2kMWKHdml8w7M3FXg6gwCA=; b=Y4G1n5p7mbv18Di0j+RAtnRwPvCrFZLCVsiqUnIciPq5fQEWHYCJj51AlJ4Ef9obwOwtNt r1UOJoXWJYHufXKiB/lKBt6Di5QBYKrVkkND26gaewy/YxwUPUwCG7Lk7NYJmARj/jMZLv BixczYJ0V7XsRwip1Inlym5NReOsJC0Rqp0O3tXSjDFfduy7WWG6Pcvf3fP2qLyGWe2rOF WyEjCgN/guLV1lGRdZA8A1F6iU3BDWzxtNpHhO2lYkzh4RShWWP26kgsgzkh3qvag+WLCq lxc5wAl40LZsf/xy7lFWcKdrd0WELy3xEgSpBAquVQciQkw0VjuepJ0/FZ6kew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756721768; a=rsa-sha256; cv=none; b=OU+7lPpy+6f3CVhlaKrHlHk92Ph7DjvWUMeA97UNjzL/bcXIhKk5BmrUXZyJvXMuf/Jel8 6VCYnoq+3gQ/X9gxNNEL7Q1ejKRFm3fcewXRuzo5iLhMVhgPEAG3mGuTen9Zb+4Gyu6xIz hcl7imLTk+VsGwPjp52R36urXbtGhf/29ZdnB2UiAICbx1cgBPnWvmpwqTbAeQ3+GrlPnL se2vcuPv69K61Grr4QCi54OfuooLMA8zaaBGblBL1IY1JVe8FS9pM6gPoktu3GNw63J2iO RMXn4NQl3P8DodU+3qfRWuQ6UKSm+cP8KZkmq+mkfRjtA3wp/VnZXZJuMQ8AbA== 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 4cFlBw4hDTzvyc; Mon, 01 Sep 2025 10:16:08 +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 581AG8mx075366; Mon, 1 Sep 2025 10:16:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 581AG84W075363; Mon, 1 Sep 2025 10:16:08 GMT (envelope-from git) Date: Mon, 1 Sep 2025 10:16:08 GMT Message-Id: <202509011016.581AG84W075363@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 9764aa1ccad0 - main - bridge: Fix adding gif(4) interface assigned with IP addresses as bridge memeber 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9764aa1ccad08a7ec53ed9b80741b9553f3fa4e6 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=9764aa1ccad08a7ec53ed9b80741b9553f3fa4e6 commit 9764aa1ccad08a7ec53ed9b80741b9553f3fa4e6 Author: Zhenlei Huang AuthorDate: 2025-09-01 10:14:22 +0000 Commit: Zhenlei Huang CommitDate: 2025-09-01 10:14:22 +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 --- 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 66555fd1feb5..a854bbb96394 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -1447,10 +1447,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 963449d4b4b1..0e283a7d099d 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -522,8 +522,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 ce0655408a28..a9e6c4eaa51b 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -1236,8 +1236,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; }