From nobody Mon Jul 28 17:38:16 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 4brQgD3K23z63JfV; Mon, 28 Jul 2025 17:38:16 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4brQgD2WwTz3k9p; Mon, 28 Jul 2025 17:38:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753724296; 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=091g7KKAaEoR6fbymXRMwq09SMxzMk4HTk6iggGoIcM=; b=i5M+OH64h2tNl31GILosUYB6UPcuEE+ob+OAolQhKcTRmbQ9egsnK668MtF0GPZelq1IIz yGVDOMD97EoS8s/911eH/XB7NEV2tjZt/Kxz26N5Peq14IphDXUizcUQ2EIafXw4fql/Nu x1wTqB/HjUnjZE2hB0OpmvHfS1sH00tP46Wj3ioTMdAbcJCDruwR0P4eJ958JP+HUhGwy1 V5/v1kHmpJpIUvL/NrQhlPABcI8X0/iGSUr5G1xdJFQ5q4yMFfNAl5UV/JXgUQOE8APWI3 toM7ND0vJhmPYcOjU6qR1nbJ4+tYuSMuTwKrdBBaLFGNubMVbn3XZFFE/et7cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753724296; 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=091g7KKAaEoR6fbymXRMwq09SMxzMk4HTk6iggGoIcM=; b=X3RP/UYFZqIEwahUjnuJKyA3RDcFpnU/XTpce9rnBffFnrHD05dxfrImsNTEZFXb7lP3pr /EoModSsd5xHP1GErJ8wZuBk6oA7mcy1u6nidR3D3BDlyFKNqhW40/xU4K+fZScE0TCofx ZJkw4L0I7hYbXxGp3KHYJ2OoZyG1NtPJQmE5+Td/ZoBprlU9g2A7khvSXXitv2VgBjrp1p yiCSxyEdROmtUDS8cMg9Q4R8A931XttXBzYpD1Xa/Vo5VDwAKHVf0V5sBI0jKo9hJdnH1d GUzGQq84pzVjPa2bIo1hXRIHVmK0d0pmlpOv+onhXsxWgdNY7tGCcMPKm2Ln4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753724296; a=rsa-sha256; cv=none; b=iH07oL2rRHguNLjke2qE0O3kTylfhGC9kLPW4rSxFinWF1DcWJevh7e2zkLsD/XK9xm8WO +WHcFrqeaw7/SkJ32ELeUq4opORO5wLINT/FVwC98uY3lB8G1eOTyk+shcOE8B0HHJBw6P Bi9tmu9Dw/yQ6Cu665BLSozOCzaupn8S9YP68avDR9LhR0WJ/+wwmkiE3Nt5WDdi70wz8/ soMzZeavLR04IMUbjxbfACBPGVdg9HS4W7jnKsE37gMxui7cobvO81anq4Ok1ilU6dEMzA es1ZU1hQ70TR4hqbmjfQ0TPuZbVeXOaSVy/y2XsVHfLxvWlSdF0GFlN9B+T3zQ== 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 4brQgD25rmzvV5; Mon, 28 Jul 2025 17:38:16 +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 56SHcGW7041771; Mon, 28 Jul 2025 17:38:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56SHcGqJ041768; Mon, 28 Jul 2025 17:38:16 GMT (envelope-from git) Date: Mon, 28 Jul 2025 17:38:16 GMT Message-Id: <202507281738.56SHcGqJ041768@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 64f493e664cc - main - bridge: do not allow a bridge SVI in a bridge 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 64f493e664cc4bd52c67c6ba2c36a35f68c9fbe4 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=64f493e664cc4bd52c67c6ba2c36a35f68c9fbe4 commit 64f493e664cc4bd52c67c6ba2c36a35f68c9fbe4 Author: Lexi Winter AuthorDate: 2025-07-28 17:38:02 +0000 Commit: Lexi Winter CommitDate: 2025-07-28 17:38:02 +0000 bridge: do not allow a bridge SVI in a bridge Disallow this: ifconfig bridge0 create ifconfig bridge0.1 create ifconfig bridge0 addm bridge0.1 Also disallow this: ifconfig vlan1 create ifconfig bridge0 create ifconfig bridge0 addm vlan1 ifconfig vlan1 vlan 1 vlandev bridge0 Firstly, this panics due to trying to take BRIDGE_LOCK recursively. Secondly, even if it worked, it could cause packet forwarding loops. Reviewed by: des Differential Revision: https://reviews.freebsd.org/D51310 --- sys/net/if_bridge.c | 23 +++++++++++++++++++++++ sys/net/if_vlan.c | 12 ++++++++++++ tests/sys/net/if_bridge_test.sh | 24 ++++++++++++++++++++++++ tests/sys/net/if_vlan.sh | 27 +++++++++++++++++++++++++++ 4 files changed, 86 insertions(+) diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index 64aaecf6f029..0a35fb4095fb 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -1335,6 +1335,29 @@ bridge_ioctl_add(struct bridge_softc *sc, void *arg) if (ifs->if_ioctl == NULL) /* must be supported */ return (EXTERROR(EINVAL, "Interface must support ioctl(2)")); + /* + * If the new interface is a vlan(4), it could be a bridge SVI. + * Don't allow such things to be added to bridges. + */ + if (ifs->if_type == IFT_L2VLAN) { + struct ifnet *parent; + struct epoch_tracker et; + bool is_bridge; + + /* + * Entering NET_EPOCH with BRIDGE_LOCK held, but this is okay + * since we don't sleep here. + */ + NET_EPOCH_ENTER(et); + parent = VLAN_TRUNKDEV(ifs); + is_bridge = (parent != NULL && parent->if_type == IFT_BRIDGE); + NET_EPOCH_EXIT(et); + + if (is_bridge) + return (EXTERROR(EINVAL, + "Bridge SVI cannot be added to a bridge")); + } + /* If it's in the span list, it can't be a member. */ CK_LIST_FOREACH(bif, &sc->sc_spanlist, bif_next) if (ifs == bif->bif_ifp) diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index 22fcb7bf7c64..61000018e5a4 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -2336,6 +2336,18 @@ vlan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) error = ENOENT; break; } + + /* + * If the ifp is in a bridge, do not allow setting the device + * to a bridge; this prevents having a bridge SVI as a bridge + * member (which is not permitted). + */ + if (ifp->if_bridge != NULL && p->if_type == IFT_BRIDGE) { + if_rele(p); + error = EINVAL; + break; + } + if (vlr.vlr_proto == 0) vlr.vlr_proto = ETHERTYPE_VLAN; oldmtu = ifp->if_mtu; diff --git a/tests/sys/net/if_bridge_test.sh b/tests/sys/net/if_bridge_test.sh index cd38adea28ad..c0c085f22273 100755 --- a/tests/sys/net/if_bridge_test.sh +++ b/tests/sys/net/if_bridge_test.sh @@ -1221,6 +1221,29 @@ vlan_qinq_cleanup() vnet_cleanup } +# Adding a bridge SVI to a bridge should not be allowed. +atf_test_case "bridge_svi_in_bridge" "cleanup" +bridge_svi_in_bridge_head() +{ + atf_set descr 'adding a bridge SVI to a bridge is not allowed (1)' + atf_set require.user root +} + +bridge_svi_in_bridge_body() +{ + vnet_init + vnet_init_bridge + + bridge=$(vnet_mkbridge) + atf_check -s exit:0 ifconfig ${bridge}.1 create + atf_check -s exit:1 -e ignore ifconfig ${bridge} addm ${bridge}.1 +} + +bridge_svi_in_bridge_cleanup() +{ + vnet_cleanup +} + atf_init_test_cases() { atf_add_test_case "bridge_transmit_ipv4_unicast" @@ -1247,4 +1270,5 @@ atf_init_test_cases() atf_add_test_case "vlan_ifconfig_tagged" atf_add_test_case "vlan_svi" atf_add_test_case "vlan_qinq" + atf_add_test_case "bridge_svi_in_bridge" } diff --git a/tests/sys/net/if_vlan.sh b/tests/sys/net/if_vlan.sh index 424eac705b94..8122203337e2 100755 --- a/tests/sys/net/if_vlan.sh +++ b/tests/sys/net/if_vlan.sh @@ -333,6 +333,32 @@ conflict_id_cleanup() } +# If a vlan interface is in a bridge, changing the vlandev to refer to +# a bridge should not be allowed. +atf_test_case "bridge_vlandev" "cleanup" +bridge_vlandev_head() +{ + atf_set descr 'transforming a bridge member vlan into an SVI is not allowed' + atf_set require.user root +} + +bridge_vlandev_body() +{ + vnet_init + vnet_init_bridge + + bridge=$(vnet_mkbridge) + vlan=$(vnet_mkvlan) + + atf_check -s exit:0 ifconfig ${bridge} addm ${vlan} + atf_check -s exit:1 -e ignore ifconfig ${vlan} vlan 1 vlandev ${bridge} +} + +bridge_vlandev_cleanup() +{ + vnet_cleanup +} + atf_init_test_cases() { atf_add_test_case "basic" @@ -343,4 +369,5 @@ atf_init_test_cases() atf_add_test_case "qinq_setflags" atf_add_test_case "bpf_pcp" atf_add_test_case "conflict_id" + atf_add_test_case "bridge_vlandev" }