summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2005-06-21 14:06:24 -0700
committerDavid S. Miller <davem@davemloft.net>2005-06-21 14:06:24 -0700
commit2715bcf9efc34063e05009f188eb896c462ae925 (patch)
tree57a36042e5774cdc731f9ecfc7a51bb54bdd6619 /net
parent6150bacfec95c7042678667561664efcf10d4508 (diff)
downloadlinux-3.10-2715bcf9efc34063e05009f188eb896c462ae925.tar.gz
linux-3.10-2715bcf9efc34063e05009f188eb896c462ae925.tar.bz2
linux-3.10-2715bcf9efc34063e05009f188eb896c462ae925.zip
[NETFILTER]: Drop conntrack reference in ip_call_ra_chain()/ip_mr_input()
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>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/ip_input.c1
-rw-r--r--net/ipv4/ipmr.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c
index 2b7485e6504..af2ec88bbb2 100644
--- a/net/ipv4/ip_input.c
+++ b/net/ipv4/ip_input.c
@@ -184,6 +184,7 @@ int ip_call_ra_chain(struct sk_buff *skb)
raw_rcv(last, skb2);
}
last = sk;
+ nf_reset(skb);
}
}
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index e21c049ec62..e4f809a93f4 100644
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -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;