netdev - Re: [PATCH] net: Support filtering interfaces on no master

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-prev] [thread-next>] [day] [month] [year] [list]

Date:   Mon, 9 Aug 2021 09:54:32 +0300
From:   Lahav Schlesinger <lschlesinger@...venets.com>
To:     David Ahern <dsahern@...il.com>
Cc:     netdev@...r.kernel.org, dsahern@...nel.org, davem@...emloft.net,
        kuba@...nel.org
Subject: Re: [PATCH] net: Support filtering interfaces on no master

On Sun, Aug 08, 2021 at 02:02:36PM -0600, David Ahern wrote:
> On 8/8/21 7:28 AM, Lahav Schlesinger wrote:
> > Currently there's support for filtering neighbours/links for interfaces
> > which have a specific master device (using the IFLA_MASTER/NDA_MASTER
> > attributes).
> >
> > This patch adds support for filtering interfaces/neighbours dump for
> > interfaces that *don't* have a master.
> >
> > I have a patch for iproute2 ready for adding this support in userspace.
> >
> > Signed-off-by: Lahav Schlesinger <lschlesinger@...venets.com>
> > Cc: David Ahern <dsahern@...nel.org>
> > Cc: David S. Miller <davem@...emloft.net>
> > Cc: Jakub Kicinski <kuba@...nel.org>
> > ---
> >  net/core/neighbour.c | 7 +++++++
> >  net/core/rtnetlink.c | 7 +++++++
> >  2 files changed, 14 insertions(+)
> >
> > diff --git a/net/core/neighbour.c b/net/core/neighbour.c
> > index 53e85c70c6e5..1b1e0ca70650 100644
> > --- a/net/core/neighbour.c
> > +++ b/net/core/neighbour.c
> > @@ -2533,6 +2533,13 @@ static bool neigh_master_filtered(struct net_device *dev, int master_idx)
> >  		return false;
> >
> >  	master = dev ? netdev_master_upper_dev_get(dev) : NULL;
> > +
> > +	/* 0 is already used to denote NDA_MASTER wasn't passed, therefore need another
> > +	 * invalid value for ifindex to denote "no master".
> > +	 */
> > +	if (master_idx == -1)
> > +                return (bool)master;
>
> return !!master;
>
> same below
>
> > +
> >  	if (!master || master->ifindex != master_idx)
> >  		return true;
> >
> > diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
> > index f6af3e74fc44..8ccc314744d4 100644
> > --- a/net/core/rtnetlink.c
> > +++ b/net/core/rtnetlink.c
> > @@ -1970,6 +1970,13 @@ static bool link_master_filtered(struct net_device *dev, int master_idx)
> >  		return false;
> >
> >  	master = netdev_master_upper_dev_get(dev);
> > +
> > +	/* 0 is already used to denote IFLA_MASTER wasn't passed, therefore need
> > +	 * another invalid value for ifindex to denote "no master".
> > +	 */
> > +	if (master_idx == -1)
> > +                return (bool)master;
> > +
> >  	if (!master || master->ifindex != master_idx)
> >  		return true;
> >
> >
>


>From 7908142b2d4799672a7f9dd27e848214e3c4a0a7 Mon Sep 17 00:00:00 2001
From: Lahav Schlesinger <lschlesinger@...venets.com>
Date: Sun, 8 Aug 2021 13:16:44 +0000
Subject: [PATCH] net: Support filtering interfaces on no master

Currently there's support for filtering neighbours/links for interfaces
which have a specific master device (using the IFLA_MASTER/NDA_MASTER
attributes).

This patch adds support for filtering interfaces/neighbours dump for
interfaces that *don't* have a master.

I have a patch for iproute2 ready for adding this support in userspace.

Signed-off-by: Lahav Schlesinger <lschlesinger@...venets.com>
Cc: David Ahern <dsahern@...nel.org>
Cc: David S. Miller <davem@...emloft.net>
Cc: Jakub Kicinski <kuba@...nel.org>
---
 net/core/neighbour.c | 7 +++++++
 net/core/rtnetlink.c | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index 53e85c70c6e5..3aeefc48b96a 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -2533,6 +2533,13 @@ static bool neigh_master_filtered(struct net_device *dev, int master_idx)
 		return false;

 	master = dev ? netdev_master_upper_dev_get(dev) : NULL;
+
+	/* 0 is already used to denote NDA_MASTER wasn't passed, therefore need another
+	 * invalid value for ifindex to denote "no master".
+	 */
+	if (master_idx == -1)
+		return !!master;
+
 	if (!master || master->ifindex != master_idx)
 		return true;

diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index f6af3e74fc44..bc4d62174ab0 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -1970,6 +1970,13 @@ static bool link_master_filtered(struct net_device *dev, int master_idx)
 		return false;

 	master = netdev_master_upper_dev_get(dev);
+
+	/* 0 is already used to denote IFLA_MASTER wasn't passed, therefore need
+	 * another invalid value for ifindex to denote "no master".
+	 */
+	if (master_idx == -1)
+		return !!master;
+
 	if (!master || master->ifindex != master_idx)
 		return true;

--
2.25.1