Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94969208 authored by Andrew Lunn's avatar Andrew Lunn Committed by Simon Wunderlich
Browse files

batman-adv: Suppress debugfs entries for netns's 



Debugfs is not netns aware. It thus has problems when the same
interface name exists in multiple network name spaces.

Work around this by not creating entries for interfaces in name spaces
other than the default name space. This means meshes in network
namespaces cannot be managed via debugfs, but there will soon be a
netlink interface which is netns aware.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarSimon Wunderlich <sw@simonwunderlich.de>
Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
Signed-off-by: default avatarMarek Lindner <mareklindner@neomailbox.ch>
parent 275019d2

net/batman-adv/debugfs.c

+18 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <linux/stddef.h>

#include <linux/stringify.h>

#include <linux/sysfs.h>

#include <net/net_namespace.h>



#include "bat_algo.h"

#include "bridge_loop_avoidance.h"
@@ -305,12 +306,16 @@ void batadv_debugfs_destroy(void) 
 */

int batadv_debugfs_add_hardif(struct batadv_hard_iface *hard_iface)

{

	struct net *net = dev_net(hard_iface->net_dev);

	struct batadv_debuginfo **bat_debug;

	struct dentry *file;



	if (!batadv_debugfs)

		goto out;



	if (net != &init_net)

		return 0;



	hard_iface->debug_dir = debugfs_create_dir(hard_iface->net_dev->name,

						   batadv_debugfs);

	if (!hard_iface->debug_dir)
@@ -341,6 +346,11 @@ int batadv_debugfs_add_hardif(struct batadv_hard_iface *hard_iface) 
 */

void batadv_debugfs_del_hardif(struct batadv_hard_iface *hard_iface)

{

	struct net *net = dev_net(hard_iface->net_dev);



	if (net != &init_net)

		return;



	if (batadv_debugfs) {

		debugfs_remove_recursive(hard_iface->debug_dir);

		hard_iface->debug_dir = NULL;
@@ -351,11 +361,15 @@ int batadv_debugfs_add_meshif(struct net_device *dev) 
{

	struct batadv_priv *bat_priv = netdev_priv(dev);

	struct batadv_debuginfo **bat_debug;

	struct net *net = dev_net(dev);

	struct dentry *file;



	if (!batadv_debugfs)

		goto out;



	if (net != &init_net)

		return 0;



	bat_priv->debug_dir = debugfs_create_dir(dev->name, batadv_debugfs);

	if (!bat_priv->debug_dir)

		goto out;
@@ -392,6 +406,10 @@ int batadv_debugfs_add_meshif(struct net_device *dev) 
void batadv_debugfs_del_meshif(struct net_device *dev)

{

	struct batadv_priv *bat_priv = netdev_priv(dev);

	struct net *net = dev_net(dev);



	if (net != &init_net)

		return;



	batadv_debug_log_cleanup(bat_priv);