Re: [IPV6]: Fix raw socket hardware checksum failures

[Patrick McHardy]

David S. Miller wrote:

Applied to both net-2.6 and net-2.6.14

BTW, the IPv6 skb leak fix is only in your net-2.6.14 tree
so far, I think it should go in net-2.6 as well.


[IPV6]: Fix SKB leak in ip6_input_finish()

Changing it to how ip_input handles should fix it.

Signed-off-by: Patrick McHardy <[EMAIL PROTECTED]>
Signed-off-by: David S. Miller <[EMAIL PROTECTED]>

---
commit e707ebf55746b2862be9d7368d42e9a0f0774757
tree 7753e0e6735394ea682dcf65be4f2195f0963aeb
parent 9d7c46e45eb9d73f96d05dbf5130aa9b5bdc3452
author Patrick McHardy <[EMAIL PROTECTED]> Tue, 09 Aug 2005 19:50:23 -0700
committer David S. Miller <[EMAIL PROTECTED]> Tue, 09 Aug 2005 19:50:23 -0700

 net/ipv6/ip6_input.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c
--- 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;