From: Andrew Lunn <andrew@lunn.ch>
To: Antonio Quartulli <a@unstable.cc>
Cc: "B.A.T.M.A.N" <b.a.t.m.a.n@lists.open-mesh.net>
Subject: [B.A.T.M.A.N.] [PATCHv2 3/4] batman-adv: Handle parent interfaces in a different netns
Date: Tue, 1 Mar 2016 22:19:07 +0100 [thread overview]
Message-ID: <1456867148-31883-4-git-send-email-andrew@lunn.ch> (raw)
In-Reply-To: <1456867148-31883-1-git-send-email-andrew@lunn.ch>
batman-adv tries to prevent the user from placing a batX soft
interface into another batman mesh as a hard interface. It does this
by walking up the devices list of parents and ensures they are all
none batX interfaces. iflink can point to an interface in a different
namespace, so also retrieve the parents name space when finding the
parent and use it when doing the comparison.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Acked-by: Antonio Quartulli <a@untable.cc>
---
net/batman-adv/hard-interface.c | 31 ++++++++++++++++++++++++-------
1 file changed, 24 insertions(+), 7 deletions(-)
diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
index b28eacc..51e9e68 100644
--- a/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
@@ -85,24 +85,37 @@ out:
/**
* batadv_mutual_parents - check if two devices are each others parent
- * @dev1: 1st net_device
- * @dev2: 2nd net_device
+ * @dev1: 1st net dev
+ * @net1: 1st devices netns
+ * @dev2: 2nd net dev
+ * @net2: 2nd devices netns
*
* veth devices come in pairs and each is the parent of the other!
*
* Return: true if the devices are each others parent, otherwise false
*/
static bool batadv_mutual_parents(const struct net_device *dev1,
- const struct net_device *dev2)
+ const struct net *net1,
+ const struct net_device *dev2,
+ const struct net *net2)
{
int dev1_parent_iflink = dev_get_iflink(dev1);
int dev2_parent_iflink = dev_get_iflink(dev2);
+ const struct net *dev1_parent_net = net1;
+ const struct net *dev2_parent_net = net2;
+
+ if (dev1->rtnl_link_ops && dev1->rtnl_link_ops->get_link_net)
+ dev1_parent_net = dev1->rtnl_link_ops->get_link_net(dev1);
+ if (dev2->rtnl_link_ops && dev2->rtnl_link_ops->get_link_net)
+ dev2_parent_net = dev2->rtnl_link_ops->get_link_net(dev2);
if (!dev1_parent_iflink || !dev2_parent_iflink)
return false;
return (dev1_parent_iflink == dev2->ifindex) &&
- (dev2_parent_iflink == dev1->ifindex);
+ (dev2_parent_iflink == dev1->ifindex) &&
+ net_eq(dev1_parent_net, net2) &&
+ net_eq(dev2_parent_net, net1);
}
/**
@@ -120,8 +133,9 @@ static bool batadv_mutual_parents(const struct net_device *dev1,
*/
static bool batadv_is_on_batman_iface(const struct net_device *net_dev)
{
- struct net_device *parent_dev;
struct net *net = dev_net(net_dev);
+ struct net_device *parent_dev;
+ struct net *parent_net = net;
bool ret;
/* check if this is a batman-adv mesh interface */
@@ -133,13 +147,16 @@ static bool batadv_is_on_batman_iface(const struct net_device *net_dev)
dev_get_iflink(net_dev) == net_dev->ifindex)
return false;
+ if (net_dev->rtnl_link_ops && net_dev->rtnl_link_ops->get_link_net)
+ parent_net = net_dev->rtnl_link_ops->get_link_net(net_dev);
+
/* recurse over the parent device */
- parent_dev = __dev_get_by_index(net, dev_get_iflink(net_dev));
+ parent_dev = __dev_get_by_index(parent_net, dev_get_iflink(net_dev));
/* if we got a NULL parent_dev there is something broken.. */
if (WARN(!parent_dev, "Cannot find parent device"))
return false;
- if (batadv_mutual_parents(net_dev, parent_dev))
+ if (batadv_mutual_parents(net_dev, net, parent_dev, parent_net))
return false;
ret = batadv_is_on_batman_iface(parent_dev);
--
2.7.0.rc3
next prev parent reply other threads:[~2016-03-01 21:19 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-01 21:19 [B.A.T.M.A.N.] [PATCHv2 0/4] batman-adv: Add network name space support Andrew Lunn
2016-03-01 21:19 ` [B.A.T.M.A.N.] [PATCHv2 1/4] batman-adv: NETIF_F_NETNS_LOCAL feature to prevent netns moves Andrew Lunn
2016-03-13 9:29 ` Sven Eckelmann
2016-03-13 15:24 ` Andrew Lunn
2016-04-21 10:48 ` Marek Lindner
2016-03-01 21:19 ` [B.A.T.M.A.N.] [PATCHv2 2/4] batman-adv: Create batman soft interfaces within correct netns Andrew Lunn
2016-03-13 10:48 ` Sven Eckelmann
2016-03-13 15:35 ` Andrew Lunn
2016-03-01 21:19 ` Andrew Lunn [this message]
2016-03-04 12:35 ` [B.A.T.M.A.N.] [PATCHv2 3/4] batman-adv: Handle parent interfaces in a different netns Sven Eckelmann
2016-03-07 14:31 ` Andrew Lunn
2016-03-07 14:45 ` Sven Eckelmann
2016-03-11 23:37 ` Sven Eckelmann
2016-03-12 4:42 ` Antonio Quartulli
2016-03-12 7:34 ` Sven Eckelmann
2016-03-12 7:40 ` Sven Eckelmann
2016-03-07 4:21 ` Linus Lüssing
2016-03-07 13:47 ` Andrew Lunn
2016-03-13 11:02 ` Sven Eckelmann
2016-03-13 15:38 ` Andrew Lunn
2016-03-13 15:59 ` Sven Eckelmann
2016-03-01 21:19 ` [B.A.T.M.A.N.] [PATCHv2 4/4] batman-adv: debugfs: Add netns support Andrew Lunn
2016-03-07 14:21 ` Matthias Schiffer
2016-03-13 9:12 ` Sven Eckelmann
2016-03-13 15:42 ` Andrew Lunn
2016-04-18 14:41 ` Simon Wunderlich
2016-04-20 2:36 ` Andrew Lunn
2016-04-20 3:23 ` Antonio Quartulli
2016-04-20 7:02 ` Sven Eckelmann
2016-03-14 10:41 ` Matthias Schiffer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1456867148-31883-4-git-send-email-andrew@lunn.ch \
--to=andrew@lunn.ch \
--cc=a@unstable.cc \
--cc=b.a.t.m.a.n@lists.open-mesh.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).