From: Patrick McHardy <kaber@trash.net>
Date: Mon, 12 Feb 2007 19:13:43 +0000 (-0800)
Subject: [NETFILTER]: nf_conntrack: fix invalid conntrack statistics RCU assumption
X-Git-Tag: v2.6.21-rc1~274^2~1^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0e912d7ed8999f87fa7f084928aac1266e251f3;p=pandora-kernel.git

[NETFILTER]: nf_conntrack: fix invalid conntrack statistics RCU assumption

NF_CT_STAT_INC assumes rcu_read_lock in nf_hook_slow disables
preemption as well, making it legal to use __get_cpu_var without
disabling preemption manually. The assumption is not correct anymore
with preemptable RCU, additionally we need to protect against softirqs
when not holding nf_conntrack_lock.

Add NF_CT_STAT_INC_ATOMIC macro, which disables local softirqs,
and use where necessary.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

Reading git-diff-tree failed