[PATCH] netns: fix proxy ARP entries listing on a netns

[PATCH] netns: fix proxy ARP entries listing on a netns

[Jorge Boncompte [DTI2]]

From: "Jorge Boncompte [DTI2]" <jorge@dti2.net>

Skip entries from foreign network namespaces.

Signed-off-by: Jorge Boncompte [DTI2] <jorge@dti2.net>
---
 net/core/neighbour.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index 039d51e..2adcbeb 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -2397,6 +2397,7 @@ static struct pneigh_entry *pneigh_get_next(struct seq_file *seq,
 	struct net *net = seq_file_net(seq);
 	struct neigh_table *tbl = state->tbl;
 
+restart:
 	pn = pn->next;
 	while (!pn) {
 		if (++state->bucket > PNEIGH_HASHMASK)
@@ -2408,6 +2409,9 @@ static struct pneigh_entry *pneigh_get_next(struct seq_file *seq,
 			break;
 	}
 
+	if (pn && !net_eq(pneigh_net(pn), net))
+		goto restart;
+
 	if (pn && pos)
 		--(*pos);
 
-- 
1.7.7.1

Re: [PATCH] netns: fix proxy ARP entries listing on a netns

[David Miller]

From: "Jorge Boncompte [DTI2]" <jorge@dti2.net>
Date: Mon, 21 Nov 2011 20:46:14 +0100

> @@ -2397,6 +2397,7 @@ static struct pneigh_entry *pneigh_get_next(struct seq_file *seq,
>  	struct net *net = seq_file_net(seq);
>  	struct neigh_table *tbl = state->tbl;
>  
> +restart:
>  	pn = pn->next;
>  	while (!pn) {

We don't need to use goto to fix this bug, instead change this assignment
to something like:

	do {
		pn = pn->next;
	} while (pn && !net_eq(pneigh_net(pn), net));

and this way it will mirror the while loop inside of the "while (!pn)"
code block.

[PATCH v2] netns: fix proxy ARP entries listing on a netns

[Jorge Boncompte [DTI2]]

From: "Jorge Boncompte [DTI2]" <jorge@dti2.net>

Skip entries from foreign network namespaces.

V2:
    Fixed as suggested by David Miller to avoid a goto.

Signed-off-by: Jorge Boncompte [DTI2] <jorge@dti2.net>
---
 net/core/neighbour.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index 2684794..27d3fef 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -2414,7 +2414,10 @@ static struct pneigh_entry *pneigh_get_next(struct seq_file *seq,
 	struct net *net = seq_file_net(seq);
 	struct neigh_table *tbl = state->tbl;
 
-	pn = pn->next;
+	do {
+		pn = pn->next;
+	} while (pn && !net_eq(pneigh_net(pn), net));
+
 	while (!pn) {
 		if (++state->bucket > PNEIGH_HASHMASK)
 			break;
-- 
1.7.7.1

Re: [PATCH v2] netns: fix proxy ARP entries listing on a netns

[David Miller]

From: "Jorge Boncompte [DTI2]" <jorge@dti2.net>
Date: Fri, 25 Nov 2011 15:41:29 +0100

> From: "Jorge Boncompte [DTI2]" <jorge@dti2.net>
> 
> Skip entries from foreign network namespaces.
> 
> V2:
>     Fixed as suggested by David Miller to avoid a goto.
> 
> Signed-off-by: Jorge Boncompte [DTI2] <jorge@dti2.net>

Applied, thanks.