summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2005-08-17 23:04:22 +0400
committerChris Wright <chrisw@osdl.org>2005-08-29 20:55:13 +0400
commitf982542ed2f495cbe94e6d9001878f27ea738b36 (patch)
tree32e7ef60432fcc48b60c187975c9a0918befeeba
parentec3b77ec116cf2b9d42f6544caa71f084cfc1ff1 (diff)
downloadlinux-f982542ed2f495cbe94e6d9001878f27ea738b36.tar.xz
[PATCH] Fix SKB leak in ip6_input_finish()
Changing it to how ip_input handles should fix it. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: "David S. Miller" <davem@davemloft.net> Signed-off-by: Chris Wright <chrisw@osdl.org>
-rw-r--r--net/ipv6/ip6_input.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c
index 866f10726c58..10fbb50daea4 100644
--- a/net/ipv6/ip6_input.c
+++ b/net/ipv6/ip6_input.c
@@ -198,12 +198,13 @@ resubmit:
if (!raw_sk) {
if (xfrm6_policy_check(NULL, XFRM_POLICY_IN, skb)) {
IP6_INC_STATS_BH(IPSTATS_MIB_INUNKNOWNPROTOS);
- icmpv6_param_prob(skb, ICMPV6_UNK_NEXTHDR, nhoff);
+ icmpv6_send(skb, ICMPV6_PARAMPROB,
+ ICMPV6_UNK_NEXTHDR, nhoff,
+ skb->dev);
}
- } else {
+ } else
IP6_INC_STATS_BH(IPSTATS_MIB_INDELIVERS);
- kfree_skb(skb);
- }
+ kfree_skb(skb);
}
rcu_read_unlock();
return 0;