netdev - [PATCH net-next] net: bridge: fix undefined br_vlan_can_enter

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:   Mon, 13 Jul 2020 10:55:46 +0300
From:   Nikolay Aleksandrov <nikolay@...ulusnetworks.com>
To:     netdev@...r.kernel.org
Cc:     roopa@...ulusnetworks.com, davem@...emloft.net,
        Nikolay Aleksandrov <nikolay@...ulusnetworks.com>,
        Stephen Rothwell <sfr@...b.auug.org.au>
Subject: [PATCH net-next] net: bridge: fix undefined br_vlan_can_enter_range in tunnel code

If bridge vlan filtering is not defined we won't have
br_vlan_can_enter_range and thus will get a compile error as was
reported by Stephen and the build bot. So let's define a stub for when
vlan filtering is not used.

Fixes: 94339443686b ("net: bridge: notify on vlan tunnel changes done via the old api")
Reported-by: Stephen Rothwell <sfr@...b.auug.org.au>
Signed-off-by: Nikolay Aleksandrov <nikolay@...ulusnetworks.com>
---
I mixed br_netlink_tunnel with br_vlan_tunnel where the former is always
compiled and the latter only with vlan filtering enabled.

 net/bridge/br_private.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 65d2c163a24a..a0034400b762 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -1200,6 +1200,12 @@ static inline void br_vlan_notify(const struct net_bridge *br,
 				  int cmd)
 {
 }
+
+static inline bool br_vlan_can_enter_range(const struct net_bridge_vlan *v_curr,
+					   const struct net_bridge_vlan *range_end)
+{
+	return true;
+}
 #endif
 
 /* br_vlan_options.c */
-- 
2.25.4