summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2014-06-05 14:28:44 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2014-06-16 12:51:35 +0200
commit266155b2de8fb721ae353688529b2f8bcdde2f90 (patch)
tree244e3225ef7f4e9bd59d13c2fe5eae7949f36b2b /net
parent7171511eaec5bf23fb06078f59784a3a0626b38f (diff)
downloadlinux-266155b2de8fb721ae353688529b2f8bcdde2f90.tar.gz
linux-266155b2de8fb721ae353688529b2f8bcdde2f90.tar.bz2
linux-266155b2de8fb721ae353688529b2f8bcdde2f90.zip
netfilter: ctnetlink: fix dumping of dying/unconfirmed conntracks
The dumping prematurely stops, it seems the callback argument that indicates that all entries have been dumped is set after iterating on the first cpu list. The dumping also may stop before the entire per-cpu list content is also dumped. With this patch, conntrack -L dying now shows the dying list content again. Fixes: b7779d06 ("netfilter: conntrack: spinlock per cpu to protect special lists.") Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net')
-rw-r--r--net/netfilter/nf_conntrack_netlink.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index 58579634427d..ef0eedd70541 100644
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -1163,9 +1163,6 @@ ctnetlink_dump_list(struct sk_buff *skb, struct netlink_callback *cb, bool dying
if (cb->args[2])
return 0;
- if (cb->args[0] == nr_cpu_ids)
- return 0;
-
for (cpu = cb->args[0]; cpu < nr_cpu_ids; cpu++) {
struct ct_pcpu *pcpu;
@@ -1194,6 +1191,7 @@ restart:
rcu_read_unlock();
if (res < 0) {
nf_conntrack_get(&ct->ct_general);
+ cb->args[0] = cpu;
cb->args[1] = (unsigned long)ct;
spin_unlock_bh(&pcpu->lock);
goto out;
@@ -1202,10 +1200,10 @@ restart:
if (cb->args[1]) {
cb->args[1] = 0;
goto restart;
- } else
- cb->args[2] = 1;
+ }
spin_unlock_bh(&pcpu->lock);
}
+ cb->args[2] = 1;
out:
if (last)
nf_ct_put(last);