summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-07-02 22:04:49 -0700
committerDavid S. Miller <davem@davemloft.net>2010-07-02 22:04:49 -0700
commit94e6721d9ce938293a02736c5f7e42205a41ea68 (patch)
tree84717f7b9ed8132db312be443126704923bff288 /net
parente2aec372ff4b7e78e79c308104a860ae0ed20950 (diff)
parent499031ac8a3df6738f6186ded9da853e8ea18253 (diff)
downloadlinux-94e6721d9ce938293a02736c5f7e42205a41ea68.tar.gz
linux-94e6721d9ce938293a02736c5f7e42205a41ea68.tar.bz2
linux-94e6721d9ce938293a02736c5f7e42205a41ea68.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'net')
-rw-r--r--net/ipv6/netfilter/ip6t_REJECT.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/net/ipv6/netfilter/ip6t_REJECT.c b/net/ipv6/netfilter/ip6t_REJECT.c
index 47d227713758..2933396e0281 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;