netfilter: ip6t_REJECT: fix a dst leak in ipv6 REJECT

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Linux Kernel Mailing List
Date: Wednesday, July 7, 2010 - 7:59 pm

Gitweb:     http://git.kernel.org/linus/499031ac8a3df6738f6186ded9da853e8ea18253
Commit:     499031ac8a3df6738f6186ded9da853e8ea18253
Parent:     aea9d711f3d68c656ad31ab578ecfb0bb5cd7f97
Author:     Eric Dumazet <eric.dumazet@gmail.com>
AuthorDate: Fri Jul 2 10:05:01 2010 +0200
Committer:  Patrick McHardy <kaber@trash.net>
CommitDate: Fri Jul 2 10:05:01 2010 +0200

    netfilter: ip6t_REJECT: fix a dst leak in ipv6 REJECT
    
    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>
    Cc: stable@kernel.org
    Signed-off-by: Patrick McHardy <kaber@trash.net>
---
 net/ipv6/netfilter/ip6t_REJECT.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/net/ipv6/netfilter/ip6t_REJECT.c b/net/ipv6/netfilter/ip6t_REJECT.c
index 47d2277..2933396 100644
--- a/net/ipv6/netfilter/ip6t_REJECT.c
+++ b/net/ipv6/netfilter/ip6t_REJECT.c
@@ -97,9 +97,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;
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
netfilter: ip6t_REJECT: fix a dst leak in ipv6 REJECT, Linux Kernel Mailing ..., (Wed Jul 7, 7:59 pm)