diff options
author | Patrick McHardy <kaber@trash.net> | 2005-06-21 17:06:24 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2005-06-21 17:06:24 -0400 |
commit | 2715bcf9efc34063e05009f188eb896c462ae925 (patch) | |
tree | 57a36042e5774cdc731f9ecfc7a51bb54bdd6619 /net | |
parent | 6150bacfec95c7042678667561664efcf10d4508 (diff) |
[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.c | 1 | ||||
-rw-r--r-- | net/ipv4/ipmr.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c index 2b7485e65040..af2ec88bbb2f 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) | |||
184 | raw_rcv(last, skb2); | 184 | raw_rcv(last, skb2); |
185 | } | 185 | } |
186 | last = sk; | 186 | last = sk; |
187 | nf_reset(skb); | ||
187 | } | 188 | } |
188 | } | 189 | } |
189 | 190 | ||
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index e21c049ec62a..e4f809a93f47 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c | |||
@@ -1350,6 +1350,7 @@ int ip_mr_input(struct sk_buff *skb) | |||
1350 | */ | 1350 | */ |
1351 | read_lock(&mrt_lock); | 1351 | read_lock(&mrt_lock); |
1352 | if (mroute_socket) { | 1352 | if (mroute_socket) { |
1353 | nf_reset(skb); | ||
1353 | raw_rcv(mroute_socket, skb); | 1354 | raw_rcv(mroute_socket, skb); |
1354 | read_unlock(&mrt_lock); | 1355 | read_unlock(&mrt_lock); |
1355 | return 0; | 1356 | return 0; |