[NETFILTER 8/7]: Drop conntrack reference in ip_call_ra_chain()/ip_mr_input()

[NETFILTER 8/7]: Drop conntrack reference in ip_call_ra_chain()/ip_mr_input()

[Patrick McHardy]

[-- Attachment #1: Type: text/plain, Size: 84 bytes --]

Drop reference before handing packets to raw_rcv to avoid module
unload problems.



[-- Attachment #2: 08.diff --]
[-- Type: text/x-patch, Size: 1157 bytes --]

[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>

---
commit 043f4df110b0be9f82a5ddaeede9be7f7ae4c894
tree 52e36aa9adea79ec2201a881abc327aeb870f837
parent d7edb3501fc521edf0d856d30fd6bad8019ed369
author Patrick McHardy <kaber@trash.net> Tue, 21 Jun 2005 17:43:58
committer Patrick McHardy <kaber@trash.net> Tue, 21 Jun 2005 17:43:58

 net/ipv4/ip_input.c |    1 +
 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
--- 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
--- 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;

Re: [NETFILTER 8/7]: Drop conntrack reference in ip_call_ra_chain()/ip_mr_input()

[David S. Miller]

From: Patrick McHardy <kaber@trash.net>
Date: Tue, 21 Jun 2005 17:45:09 +0200

> [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>

Applied, thanks Patrick.