Patchwork [RFC(v2),net-next,09/13] ipv6: Do not depend on rt->n in rt6_check_neigh().

login
register
mail settings
Submitter YOSHIFUJI Hideaki / 吉藤英明
Date Jan. 15, 2013, 4:46 p.m.
Message ID <50F587D4.6060208@linux-ipv6.org>
Download mbox | patch
Permalink /patch/212235/
State RFC
Delegated to: David Miller
Headers show

Comments

YOSHIFUJI Hideaki / 吉藤英明 - Jan. 15, 2013, 4:46 p.m.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
---
 net/ipv6/route.c |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)
WANG Cong - Jan. 16, 2013, 6:53 a.m.
On 01/16/2013 12:46 AM, YOSHIFUJI Hideaki wrote:
> Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
> ---
>   net/ipv6/route.c |   15 ++++++++++-----
>   1 file changed, 10 insertions(+), 5 deletions(-)
> 
> diff --git a/net/ipv6/route.c b/net/ipv6/route.c
> index e16a483..ffdc8a6 100644
> --- a/net/ipv6/route.c
> +++ b/net/ipv6/route.c
> @@ -552,20 +552,25 @@ static inline bool rt6_check_neigh(struct rt6_info *rt)
>   	struct neighbour *neigh;
>   	bool ret = false;
>   
> -	neigh = rt->n;
>   	if (rt->rt6i_flags & RTF_NONEXTHOP ||
> -	    !(rt->rt6i_flags & RTF_GATEWAY))
> +	    !(rt->rt6i_flags & RTF_GATEWAY)) {
>   		ret = true;
> -	else if (neigh) {
> -		read_lock_bh(&neigh->lock);
> +		goto out;
> +	}

Just return true here...

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index e16a483..ffdc8a6 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -552,20 +552,25 @@  static inline bool rt6_check_neigh(struct rt6_info *rt)
 	struct neighbour *neigh;
 	bool ret = false;
 
-	neigh = rt->n;
 	if (rt->rt6i_flags & RTF_NONEXTHOP ||
-	    !(rt->rt6i_flags & RTF_GATEWAY))
+	    !(rt->rt6i_flags & RTF_GATEWAY)) {
 		ret = true;
-	else if (neigh) {
-		read_lock_bh(&neigh->lock);
+		goto out;
+	}
+	rcu_read_lock_bh();
+	neigh = __ipv6_neigh_lookup_noref(rt->dst.dev, &rt->rt6i_gateway);
+	if (neigh) {
+		read_lock(&neigh->lock);
 		if (neigh->nud_state & NUD_VALID)
 			ret = true;
 #ifdef CONFIG_IPV6_ROUTER_PREF
 		else if (!(neigh->nud_state & NUD_FAILED))
 			ret = true;
 #endif
-		read_unlock_bh(&neigh->lock);
+		read_unlock(&neigh->lock);
 	}
+	rcu_read_unlock_bh();
+out:
 	return ret;
 }