]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
netfilter: ip6t_REJECT: fix a dst leak in ipv6 REJECT
authorEric Dumazet <eric.dumazet@gmail.com>
Fri, 2 Jul 2010 08:05:01 +0000 (10:05 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 2 Aug 2010 17:26:35 +0000 (10:26 -0700)
commit 499031ac8a3df6738f6186ded9da853e8ea18253 upstream.

We should release dst if dst->error is set.

Bug introduced in 2.6.14 by commit e104411b82f5c
([XFRM]: Always release dst_entry on error in xfrm_lookup)

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
net/ipv6/netfilter/ip6t_REJECT.c

index 8311ca31816aed8355a7ead992ed42d11ca4a638..35ae554d7ace1b68b34a002a5827b021476096ba 100644 (file)
@@ -95,9 +95,11 @@ static void send_reset(struct net *net, struct sk_buff *oldskb)
        fl.fl_ip_dport = otcph.source;
        security_skb_classify_flow(oldskb, &fl);
        dst = ip6_route_output(net, NULL, &fl);
-       if (dst == NULL)
+       if (dst == NULL || dst->error) {
+               dst_release(dst);
                return;
-       if (dst->error || xfrm_lookup(net, &dst, &fl, NULL, 0))
+       }
+       if (xfrm_lookup(net, &dst, &fl, NULL, 0))
                return;
 
        hh_len = (dst->dev->hard_header_len + 15)&~15;