archive/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-08-15 22:21:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

[NETFILTER]: nf_conntrack_netlink: sync expectation dumping with conntrack table dumping

Browse source 
Resync expectation table dumping code with conntrack dumping: don't
rely on the unique ID anymore since that requires to walk the list
backwards, which doesn't work with the upcoming conversion to hlists.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Patrick McHardy 2007-07-07 22:32:34 -07:00 • committed by David S. Miller
parent 4e1d4e6c5a
commit cf6994c2b9
1 changed files with 25 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

32
net/netfilter/nf_conntrack_netlink.c
View file

@ -1235,32 +1235,50 @@ nfattr_failure:
return NOTIFY_DONE; return NOTIFY_DONE;
} }
#endif #endif
static int ctnetlink_exp_done(struct netlink_callback *cb)
{
if (cb->args[0])
nf_ct_expect_put((struct nf_conntrack_expect *)cb->args[0]);
return 0;
}
static int static int
ctnetlink_exp_dump_table(struct sk_buff *skb, struct netlink_callback *cb) ctnetlink_exp_dump_table(struct sk_buff *skb, struct netlink_callback *cb)
{ {
struct nf_conntrack_expect *exp = NULL; struct nf_conntrack_expect *exp, *last;
struct list_head *i; struct list_head *i;
u_int32_t *id = (u_int32_t *) &cb->args[0];
struct nfgenmsg *nfmsg = NLMSG_DATA(cb->nlh); struct nfgenmsg *nfmsg = NLMSG_DATA(cb->nlh);
u_int8_t l3proto = nfmsg->nfgen_family; u_int8_t l3proto = nfmsg->nfgen_family;
read_lock_bh(&nf_conntrack_lock); read_lock_bh(&nf_conntrack_lock);
last = (struct nf_conntrack_expect *)cb->args[0];
restart:
list_for_each_prev(i, &nf_ct_expect_list) { list_for_each_prev(i, &nf_ct_expect_list) {
exp = (struct nf_conntrack_expect *) i; exp = (struct nf_conntrack_expect *) i;
if (l3proto && exp->tuple.src.l3num != l3proto) if (l3proto && exp->tuple.src.l3num != l3proto)
continue; continue;
if (exp->id <= *id) if (cb->args[0]) {
continue; if (exp != last)
continue;
cb->args[0] = 0;
}
if (ctnetlink_exp_fill_info(skb, NETLINK_CB(cb->skb).pid, if (ctnetlink_exp_fill_info(skb, NETLINK_CB(cb->skb).pid,
cb->nlh->nlmsg_seq, cb->nlh->nlmsg_seq,
IPCTNL_MSG_EXP_NEW, IPCTNL_MSG_EXP_NEW,
1, exp) < 0) 1, exp) < 0) {
atomic_inc(&exp->use);
cb->args[0] = (unsigned long)exp;
goto out; goto out;
*id = exp->id; }
}
if (cb->args[0]) {
cb->args[0] = 0;
goto restart;
} }
out: out:
read_unlock_bh(&nf_conntrack_lock); read_unlock_bh(&nf_conntrack_lock);
if (last)
nf_ct_expect_put(last);
return skb->len; return skb->len;
} }
@ -1287,7 +1305,7 @@ ctnetlink_get_expect(struct sock *ctnl, struct sk_buff *skb,
if (nlh->nlmsg_flags & NLM_F_DUMP) { if (nlh->nlmsg_flags & NLM_F_DUMP) {
return netlink_dump_start(ctnl, skb, nlh, return netlink_dump_start(ctnl, skb, nlh,
ctnetlink_exp_dump_table, ctnetlink_exp_dump_table,
ctnetlink_done); ctnetlink_exp_done);
} }
if (cda[CTA_EXPECT_MASTER-1]) if (cda[CTA_EXPECT_MASTER-1])