| 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
| ||
|
Message-Id: <20230515085046.4457-2-jnixdorf-oss@avm.de>
Date: Mon, 15 May 2023 10:50:46 +0200
From: Johannes Nixdorf <jnixdorf-oss@....de>
To: netdev@...r.kernel.org
Cc: bridge@...ts.linux-foundation.org,
"David S. Miller" <davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>,
Jakub Kicinski <kuba@...nel.org>,
Paolo Abeni <pabeni@...hat.com>,
Roopa Prabhu <roopa@...dia.com>,
Nikolay Aleksandrov <razor@...ckwall.org>,
Johannes Nixdorf <jnixdorf-oss@....de>
Subject: [PATCH net-next 2/2] bridge: Add a sysctl to limit new brides FDB entries
This is a convenience setting, which allows the administrator to limit
the default limit of FDB entries for all created bridges, instead of
having to set it for each created bridge using the netlink property.
The setting is network namespace local, and defaults to 0, which means
unlimited, for backwards compatibility reasons.
Signed-off-by: Johannes Nixdorf <jnixdorf-oss@....de>
---
net/bridge/br.c | 83 +++++++++++++++++++++++++++++++++++++++++
net/bridge/br_device.c | 4 +-
net/bridge/br_private.h | 9 +++++
3 files changed, 95 insertions(+), 1 deletion(-)
diff --git a/net/bridge/br.c b/net/bridge/br.c
index 4f5098d33a46..e32bb956111c 100644
--- a/net/bridge/br.c
+++ b/net/bridge/br.c
@@ -14,6 +14,7 @@
#include <linux/init.h>
#include <linux/llc.h>
#include <net/llc.h>
+#include <net/netns/generic.h>
#include <net/stp.h>
#include <net/switchdev.h>
@@ -348,6 +349,82 @@ void br_opt_toggle(struct net_bridge *br, enum net_bridge_opts opt, bool on)
clear_bit(opt, &br->options);
}
+#ifdef CONFIG_SYSCTL
+static unsigned int br_net_id __read_mostly;
+
+struct br_net {
+ struct ctl_table_header *ctl_hdr;
+
+ unsigned int fdb_max_entries_default;
+};
+
+static int br_proc_rtnl_uintvec(struct ctl_table *table, int write,
+ void *buffer, size_t *lenp, loff_t *ppos)
+{
+ int ret;
+
+ rtnl_lock();
+ ret = proc_douintvec(table, write, buffer, lenp, ppos);
+ rtnl_unlock();
+
+ return ret;
+}
+
+static struct ctl_table br_sysctl_table[] = {
+ {
+ .procname = "bridge-fdb-max-entries-default",
+ .maxlen = sizeof(unsigned int),
+ .mode = 0644,
+ .proc_handler = br_proc_rtnl_uintvec,
+ },
+ { }
+};
+
+static int __net_init br_net_init(struct net *net)
+{
+ struct ctl_table *table = br_sysctl_table;
+ struct br_net *brnet;
+
+ if (!net_eq(net, &init_net)) {
+ table = kmemdup(table, sizeof(br_sysctl_table), GFP_KERNEL);
+ if (!table)
+ return -ENOMEM;
+ }
+
+ brnet = net_generic(net, br_net_id);
+
+ brnet->fdb_max_entries_default = 0;
+
+ table[0].data = &brnet->fdb_max_entries_default;
+ brnet->ctl_hdr = register_net_sysctl(net, "net/bridge", table);
+ if (!brnet->ctl_hdr) {
+ if (!net_eq(net, &init_net))
+ kfree(table);
+
+ return -ENOMEM;
+ }
+
+ return 0;
+}
+
+static void __net_exit br_net_exit(struct net *net)
+{
+ struct br_net *brnet = net_generic(net, br_net_id);
+ struct ctl_table *table = brnet->ctl_hdr->ctl_table_arg;
+
+ unregister_net_sysctl_table(brnet->ctl_hdr);
+ if (!net_eq(net, &init_net))
+ kfree(table);
+}
+
+unsigned int br_fdb_max_entries_default(struct net *net)
+{
+ struct br_net *brnet = net_generic(net, br_net_id);
+
+ return brnet->fdb_max_entries_default;
+}
+#endif
+
static void __net_exit br_net_exit_batch(struct list_head *net_list)
{
struct net_device *dev;
@@ -367,6 +444,12 @@ static void __net_exit br_net_exit_batch(struct list_head *net_list)
}
static struct pernet_operations br_net_ops = {
+#ifdef CONFIG_SYSCTL
+ .init = br_net_init,
+ .exit = br_net_exit,
+ .id = &br_net_id,
+ .size = sizeof(struct br_net),
+#endif
.exit_batch = br_net_exit_batch,
};
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index d455a28df7c9..26023f2732e8 100644
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@ -117,8 +117,11 @@ static void br_set_lockdep_class(struct net_device *dev)
static int br_dev_init(struct net_device *dev)
{
struct net_bridge *br = netdev_priv(dev);
+ struct net *net = dev_net(dev);
int err;
+ br->fdb_max_entries = br_fdb_max_entries_default(net);
+
dev->tstats = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats);
if (!dev->tstats)
return -ENOMEM;
@@ -529,7 +532,6 @@ void br_dev_setup(struct net_device *dev)
br->bridge_forward_delay = br->forward_delay = 15 * HZ;
br->bridge_ageing_time = br->ageing_time = BR_DEFAULT_AGEING_TIME;
br->fdb_n_entries = 0;
- br->fdb_max_entries = 0;
dev->max_mtu = ETH_MAX_MTU;
br_netfilter_rtable_init(br);
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 64fb359c6e3e..d4b0f85cc278 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -2223,4 +2223,13 @@ void br_do_suppress_nd(struct sk_buff *skb, struct net_bridge *br,
u16 vid, struct net_bridge_port *p, struct nd_msg *msg);
struct nd_msg *br_is_nd_neigh_msg(struct sk_buff *skb, struct nd_msg *m);
bool br_is_neigh_suppress_enabled(const struct net_bridge_port *p, u16 vid);
+
+#ifdef CONFIG_SYSFS
+unsigned int br_fdb_max_entries_default(struct net *net);
+#else
+static inline unsigned int br_fdb_max_entries_default(struct net *net)
+{
+ return 0;
+}
+#endif
#endif
--
2.40.1
Powered by blists - more mailing lists