diff options
author | Patrick McHardy <kaber@trash.net> | 2007-02-12 14:12:57 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2007-02-12 14:12:57 -0500 |
commit | 923f4902fefdf4e89b0fb32c4e069d4f57d704f5 (patch) | |
tree | 2fad9f83c0e6da178f5167f6efb2b75cbe28c68e /net/ipv4/netfilter/nf_conntrack_proto_icmp.c | |
parent | 642d628b2c92e5283bbd3c849c7099c64ab68856 (diff) |
[NETFILTER]: nf_conntrack: properly use RCU API for nf_ct_protos/nf_ct_l3protos arrays
Replace preempt_{enable,disable} based RCU by proper use of the
RCU API and add missing rcu_read_lock/rcu_read_unlock calls in
all paths not obviously only used within packet process context
(nfnetlink_conntrack).
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/netfilter/nf_conntrack_proto_icmp.c')
-rw-r--r-- | net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv4/netfilter/nf_conntrack_proto_icmp.c b/net/ipv4/netfilter/nf_conntrack_proto_icmp.c index 677b6c80c61..e5aa4d849b0 100644 --- a/net/ipv4/netfilter/nf_conntrack_proto_icmp.c +++ b/net/ipv4/netfilter/nf_conntrack_proto_icmp.c | |||
@@ -170,7 +170,9 @@ icmp_error_message(struct sk_buff *skb, | |||
170 | return -NF_ACCEPT; | 170 | return -NF_ACCEPT; |
171 | } | 171 | } |
172 | 172 | ||
173 | /* rcu_read_lock()ed by nf_hook_slow */ | ||
173 | innerproto = __nf_ct_l4proto_find(PF_INET, inside->ip.protocol); | 174 | innerproto = __nf_ct_l4proto_find(PF_INET, inside->ip.protocol); |
175 | |||
174 | dataoff = skb->nh.iph->ihl*4 + sizeof(inside->icmp); | 176 | dataoff = skb->nh.iph->ihl*4 + sizeof(inside->icmp); |
175 | /* Are they talking about one of our connections? */ | 177 | /* Are they talking about one of our connections? */ |
176 | if (!nf_ct_get_tuple(skb, dataoff, dataoff + inside->ip.ihl*4, PF_INET, | 178 | if (!nf_ct_get_tuple(skb, dataoff, dataoff + inside->ip.ihl*4, PF_INET, |