[PATCH net-next] ipv6: fix the check when handle RA

[PATCH net-next] ipv6: fix the check when handle RA

[roy.qing.li]

From: Li RongQing <roy.qing.li@gmail.com>

d9333196572(ipv6:  Allow accepting RA from local IP addresses.) made the wrong
check, whether or not to accept RA with source-addr found on local machine, when
accept_ra_from_local is 0.

Fixes: d9333196572(ipv6:  Allow accepting RA from local IP addresses.)
Cc: Ben Greear <greearb@candelatech.com>
Cc: Hannes Frederic Sowa <hannes@redhat.com>
Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
---
 net/ipv6/ndisc.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index a845e3d..139b45f 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -1151,9 +1151,9 @@ static void ndisc_router_discovery(struct sk_buff *skb)
 	/* Do not accept RA with source-addr found on local machine unless
 	 * accept_ra_from_local is set to true.
 	 */
-	if (!(in6_dev->cnf.accept_ra_from_local ||
-	      ipv6_chk_addr(dev_net(in6_dev->dev), &ipv6_hdr(skb)->saddr,
-			    NULL, 0))) {
+	if (!in6_dev->cnf.accept_ra_from_local &&
+	    ipv6_chk_addr(dev_net(in6_dev->dev), &ipv6_hdr(skb)->saddr,
+			  NULL, 0)) {
 		ND_PRINTK(2, info,
 			  "RA from local address detected on dev: %s: default router ignored\n",
 			  skb->dev->name);
@@ -1294,9 +1294,9 @@ skip_linkparms:
 	}
 
 #ifdef CONFIG_IPV6_ROUTE_INFO
-	if (!(in6_dev->cnf.accept_ra_from_local ||
-	      ipv6_chk_addr(dev_net(in6_dev->dev), &ipv6_hdr(skb)->saddr,
-			    NULL, 0))) {
+	if (!in6_dev->cnf.accept_ra_from_local &&
+	    ipv6_chk_addr(dev_net(in6_dev->dev), &ipv6_hdr(skb)->saddr,
+			  NULL, 0)) {
 		ND_PRINTK(2, info,
 			  "RA from local address detected on dev: %s: router info ignored.\n",
 			  skb->dev->name);
-- 
1.7.10.4

Re: [PATCH net-next] ipv6: fix the check when handle RA

[Hannes Frederic Sowa]

On Do, 2014-07-10 at 18:02 +0800, roy.qing.li@gmail.com wrote:
> From: Li RongQing <roy.qing.li@gmail.com>
> 
> d9333196572(ipv6:  Allow accepting RA from local IP addresses.) made the wrong
> check, whether or not to accept RA with source-addr found on local machine, when
> accept_ra_from_local is 0.
> 
> Fixes: d9333196572(ipv6:  Allow accepting RA from local IP addresses.)
> Cc: Ben Greear <greearb@candelatech.com>
> Cc: Hannes Frederic Sowa <hannes@redhat.com>
> Signed-off-by: Li RongQing <roy.qing.li@gmail.com>

Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>

Thanks,
Hannes

Re: [PATCH net-next] ipv6: fix the check when handle RA

[David Miller]

From: roy.qing.li@gmail.com
Date: Thu, 10 Jul 2014 18:02:46 +0800

> From: Li RongQing <roy.qing.li@gmail.com>
> 
> d9333196572(ipv6:  Allow accepting RA from local IP addresses.) made the wrong
> check, whether or not to accept RA with source-addr found on local machine, when
> accept_ra_from_local is 0.
> 
> Fixes: d9333196572(ipv6:  Allow accepting RA from local IP addresses.)
> Cc: Ben Greear <greearb@candelatech.com>
> Cc: Hannes Frederic Sowa <hannes@redhat.com>
> Signed-off-by: Li RongQing <roy.qing.li@gmail.com>

Applied, thanks.

Re: [PATCH net-next] ipv6: fix the check when handle RA

[Ben Greear]

On 07/10/2014 03:02 AM, roy.qing.li@gmail.com wrote:
> From: Li RongQing <roy.qing.li@gmail.com>
>
> d9333196572(ipv6:  Allow accepting RA from local IP addresses.) made the wrong
> check, whether or not to accept RA with source-addr found on local machine, when
> accept_ra_from_local is 0.

Thanks for fixing this.  I found the 'ipv6_chk_addr' method's actual
behaviour and name hard to coorelate, and I must have written this part
while confused.

I will apply your patch and test in my scenario once I'm
back from vacation, just to be certain.

Thanks,
Ben

>
> Fixes: d9333196572(ipv6:  Allow accepting RA from local IP addresses.)
> Cc: Ben Greear <greearb@candelatech.com>
> Cc: Hannes Frederic Sowa <hannes@redhat.com>
> Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
> ---
>   net/ipv6/ndisc.c |   12 ++++++------
>   1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
> index a845e3d..139b45f 100644
> --- a/net/ipv6/ndisc.c
> +++ b/net/ipv6/ndisc.c
> @@ -1151,9 +1151,9 @@ static void ndisc_router_discovery(struct sk_buff *skb)
>   	/* Do not accept RA with source-addr found on local machine unless
>   	 * accept_ra_from_local is set to true.
>   	 */
> -	if (!(in6_dev->cnf.accept_ra_from_local ||
> -	      ipv6_chk_addr(dev_net(in6_dev->dev), &ipv6_hdr(skb)->saddr,
> -			    NULL, 0))) {
> +	if (!in6_dev->cnf.accept_ra_from_local &&
> +	    ipv6_chk_addr(dev_net(in6_dev->dev), &ipv6_hdr(skb)->saddr,
> +			  NULL, 0)) {
>   		ND_PRINTK(2, info,
>   			  "RA from local address detected on dev: %s: default router ignored\n",
>   			  skb->dev->name);
> @@ -1294,9 +1294,9 @@ skip_linkparms:
>   	}
>
>   #ifdef CONFIG_IPV6_ROUTE_INFO
> -	if (!(in6_dev->cnf.accept_ra_from_local ||
> -	      ipv6_chk_addr(dev_net(in6_dev->dev), &ipv6_hdr(skb)->saddr,
> -			    NULL, 0))) {
> +	if (!in6_dev->cnf.accept_ra_from_local &&
> +	    ipv6_chk_addr(dev_net(in6_dev->dev), &ipv6_hdr(skb)->saddr,
> +			  NULL, 0)) {
>   		ND_PRINTK(2, info,
>   			  "RA from local address detected on dev: %s: router info ignored.\n",
>   			  skb->dev->name);
>


-- 
Ben Greear <greearb@candelatech.com>
Candela Technologies Inc  http://www.candelatech.com