---

yaml --- r: 233891 b: refs/heads/master c: 7343ff3 h: refs/heads/master i: 233889: 302dc1c 233887: 81ff3b1 v: v3
git-mirror · Mar 10, 2011 · 88988e4 · 88988e4
1 parent fbe7ba6
commit 88988e4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 03a14ab134f4811ab1475f07b1305ccaf38b690f
+refs/heads/master: 7343ff31ebf01691ea4515d3126467434b9d22d6
diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c
@@ -739,8 +739,10 @@ static struct rt6_info *ip6_pol_route(struct net *net, struct fib6_table *table,
 
 	if (!rt->rt6i_nexthop && !(rt->rt6i_flags & RTF_NONEXTHOP))
 		nrt = rt6_alloc_cow(rt, &fl->fl6_dst, &fl->fl6_src);
-	else
+	else if (!(rt->dst.flags & DST_HOST))
 		nrt = rt6_alloc_clone(rt, &fl->fl6_dst);
+	else
+		goto out2;
 
 	dst_release(&rt->dst);
 	rt = nrt ? : net->ipv6.ip6_null_entry;