]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
[IPV6]: Fix dangling references on error in fib6_add().
authorDavid S. Miller <davem@davemloft.net>
Fri, 18 Apr 2008 08:46:19 +0000 (01:46 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 18 Apr 2008 08:46:19 +0000 (01:46 -0700)
Fixes bugzilla #8895

If a super-tree leaf has 'rt' assigned to it and we
get an error from fib6_add_rt2node(), we'll leave
a reference to 'rt' in pn->leaf and then do an
unconditional dst_free().

We should prune such references.

Based upon a report by Vincent Perrier.

Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/ip6_fib.c

index b3f6e03c454cc7571800fc8b06538bdb5aa4c24e..50f3f8f8a59b3bba58fad607db386a6d9c94774d 100644 (file)
@@ -772,6 +772,10 @@ out:
                 * If fib6_add_1 has cleared the old leaf pointer in the
                 * super-tree leaf node we have to find a new one for it.
                 */
+               if (pn != fn && pn->leaf == rt) {
+                       pn->leaf = NULL;
+                       atomic_dec(&rt->rt6i_ref);
+               }
                if (pn != fn && !pn->leaf && !(pn->fn_flags & RTN_RTINFO)) {
                        pn->leaf = fib6_find_prefix(info->nl_net, pn);
 #if RT6_DEBUG >= 2