]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[NETFILTER]: Drop conntrack reference in ip_call_ra_chain()/ip_mr_input()
authorPatrick McHardy <kaber@trash.net>
Tue, 21 Jun 2005 21:06:24 +0000 (14:06 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 21 Jun 2005 21:06:24 +0000 (14:06 -0700)
Drop reference before handing the packets to raw_rcv()

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/ip_input.c
net/ipv4/ipmr.c

index 2b7485e650404e6bed0689fb52573d6d69b1fe31..af2ec88bbb2fc1ae4c841f7168780f95f2e2aedb 100644 (file)
@@ -184,6 +184,7 @@ int ip_call_ra_chain(struct sk_buff *skb)
                                        raw_rcv(last, skb2);
                        }
                        last = sk;
+                       nf_reset(skb);
                }
        }
 
index e21c049ec62aeb0259791a732a88ecebfee94b8c..e4f809a93f4701efbb3f68eec77e00593ad01f7c 100644 (file)
@@ -1350,6 +1350,7 @@ int ip_mr_input(struct sk_buff *skb)
                             */
                            read_lock(&mrt_lock);
                            if (mroute_socket) {
+                                   nf_reset(skb);
                                    raw_rcv(mroute_socket, skb);
                                    read_unlock(&mrt_lock);
                                    return 0;