summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2005-08-16 21:03:41 -0700
committerDavid S. Miller <davem@davemloft.net>2005-08-16 21:03:41 -0700
commitfad87acaea7b0965fe91f0351fdd688fc9761cbe (patch)
treec14fefeeb50683accf0a34e4785155f0edad030d
parentc8ac37746489f05a32a958b048f29ae45487e81e (diff)
downloadlinux-3.10-fad87acaea7b0965fe91f0351fdd688fc9761cbe.tar.gz
linux-3.10-fad87acaea7b0965fe91f0351fdd688fc9761cbe.tar.bz2
linux-3.10-fad87acaea7b0965fe91f0351fdd688fc9761cbe.zip
[IPV6]: 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>
-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 866f10726c5..10fbb50daea 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;