Netfilter fixes for net
Subsystems (3)
Pablo Neira Ayuso
maintainercover Netfilter fixes for net
Hi David,
The following patchset contains three Netfilter fixes for your net tree, they are:
* fix incorrect comparison in the new netnet hash ipset type, from Dave Jones.
* fix splat in hashlimit due to missing removal of the content of its proc entry in netnamespaces, from Sergey Popovich.
* fix missing rule flushing operation by table in nf_tables. Table flushing was already discussed back in October but this got lost and no patch has hit the tree to address this issue so far, from me.
You can pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git master
Thanks!
----------------------------------------------------------------
The following changes since commit 2c7a9dc1641664173211c4ebc5db510a08684c46:
be2net: Avoid programming permenant MAC by BE3-R VFs (2013-11-23 15:11:07 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git master
for you to fetch changes up to cf9dc09d0949f0b5953fb08caa10bba0dc7ee71f:
netfilter: nf_tables: fix missing rules flushing per table (2013-12-07 22:55:48 +0100)
----------------------------------------------------------------
Dave Jones (1):
netfilter: ipset: fix incorret comparison in hash_netnet4_data_equal()
Pablo Neira Ayuso (1):
netfilter: nf_tables: fix missing rules flushing per table
Sergey Popovich (1):
netfilter: xt_hashlimit: fix proc entry leak in netns destroy path
net/netfilter/ipset/ip_set_hash_netnet.c | 2 +- net/netfilter/nf_tables_api.c | 46 +++++++++++++++++++++--------- net/netfilter/xt_hashlimit.c | 25 +++++++--------- 3 files changed, 45 insertions(+), 28 deletions(-)
Pablo Neira Ayuso
maintainerPATCH 1/3 netfilter: ipset: fix incorret comparison in hash_netnet4_data_equal()
From: Dave Jones <[email protected]>
Both sides of the comparison are the same, looks like a cut-and-paste error.
Spotted by Coverity.
--- net/netfilter/ipset/ip_set_hash_netnet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/ipset/ip_set_hash_netnet.c +1 -1
@@ -59,7 +59,7 @@ hash_netnet4_data_equal(const struct hash_netnet4_elem *ip1, u32 *multi) {return ip1->ipcmp == ip2->ipcmp && - ip2->ccmp == ip2->ccmp; + ip1->ccmp == ip2->ccmp; } static inline int
Signature · 1 line
1.7.10.4
Pablo Neira Ayuso
maintainerPATCH 2/3 netfilter: xt_hashlimit: fix proc entry leak in netns destroy path
In reply to Pablo Neira AyusoFrom: Sergey Popovich <[email protected]>
In (32263dd1b netfilter: xt_hashlimit: fix namespace destroy path) the hashlimit_net_exit() function is always called right before hashlimit_mt_destroy() to release netns data. If you use xt_hashlimit with IPv4 and IPv6 together, this produces the following splat via netconsole in the netns destroy path:
Pid: 9499, comm: kworker/u:0 Tainted: G WC O 3.2.0-5-netctl-amd64-core2
Call Trace: [<ffffffff8104708d>] ? warn_slowpath_common+0x78/0x8c [<ffffffff81047139>] ? warn_slowpath_fmt+0x45/0x4a [<ffffffff81144a99>] ? remove_proc_entry+0xd8/0x22e [<ffffffff810ebbaa>] ? kfree+0x5b/0x6c [<ffffffffa043c501>] ? hashlimit_net_exit+0x45/0x8d [xt_hashlimit] [<ffffffff8128ab30>] ? ops_exit_list+0x1c/0x44 [<ffffffff8128b28e>] ? cleanup_net+0xf1/0x180 [<ffffffff810369fc>] ? should_resched+0x5/0x23 [<ffffffff8105b8f9>] ? process_one_work+0x161/0x269 [<ffffffff8105aea5>] ? cwq_activate_delayed_work+0x3c/0x48 [<ffffffff8105c8c2>] ? worker_thread+0xc2/0x145 [<ffffffff8105c800>] ? manage_workers.isra.25+0x15b/0x15b [<ffffffff8105fa01>] ? kthread+0x76/0x7e [<ffffffff813581f4>] ? kernel_thread_helper+0x4/0x10 [<ffffffff8105f98b>] ? kthread_worker_fn+0x139/0x139 [<ffffffff813581f0>] ? gs_change+0x13/0x13 ---[ end trace d8c3cc0ad163ef79 ]--- ------------[ cut here ]------------ WARNING: at /usr/src/linux-3.2.52/debian/build/source_netctl/fs/proc/generic.c:849 remove_proc_entry+0x217/0x22e() Hardware name: remove_proc_entry: removing non-empty directory 'net/ip6t_hashlimit', leaking at least 'IN-REJECT'
This is due to lack of removal net/ip6t_hashlimit/* entries in hashlimit_proc_net_exit(), since only IPv4 entries are deleted. Fix it by always removing the IPv4 and IPv6 entries and their parent directories in the netns destroy path.
--- net/netfilter/xt_hashlimit.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-)
net/netfilter/xt_hashlimit.c +11 -14
@@ -325,21 +325,24 @@ static void htable_gc(unsigned long htlong)add_timer (&ht->timer); } -static void htable_destroy (struct xt_hashlimit_htable *hinfo) +static void htable_remove_proc_entry (struct xt_hashlimit_htable *hinfo) {struct hashlimit_net *hashlimit_net =hashlimit_pernet (hinfo->net);struct proc_dir_entry *parent; -del_timer_sync (&hinfo->timer); -if (hinfo->family ==NFPROTO_IPV4 ) parent = hashlimit_net->ipt_hashlimit;else parent = hashlimit_net->ip6t_hashlimit; -if (parent !=NULL ) +if (parent !=NULL )remove_proc_entry (hinfo->name, parent); +} +static void htable_destroy (struct xt_hashlimit_htable *hinfo) +{ +del_timer_sync (&hinfo->timer); +htable_remove_proc_entry (hinfo);htable_selective_cleanup (hinfo, select_all);kfree (hinfo->name);vfree (hinfo);
@@ -883,21 +886,15 @@ static int __net_init hashlimit_proc_net_init(struct net *net) static void __net_exit hashlimit_proc_net_exit(struct net *net) {struct xt_hashlimit_htable *hinfo; -struct proc_dir_entry *pde;struct hashlimit_net *hashlimit_net =hashlimit_pernet (net); -/* recent_net_exit() is called before recent_mt_destroy(). Make sure -* that the parent xt_recent proc entry is is empty before trying to -* remove it. +/* hashlimit_net_exit() is called before hashlimit_mt_destroy(). +* Make sure that the parent ipt_hashlimit and ip6t_hashlimit proc +* entries is empty before trying to remove it. */ mutex_lock (&hashlimit_mutex); - pde = hashlimit_net->ipt_hashlimit; -if (pde ==NULL ) - pde = hashlimit_net->ip6t_hashlimit; -hlist_for_each_entry (hinfo, &hashlimit_net->htables, node) -remove_proc_entry (hinfo->name, pde); - +htable_remove_proc_entry (hinfo); hashlimit_net->ipt_hashlimit =NULL ; hashlimit_net->ip6t_hashlimit =NULL ;mutex_unlock (&hashlimit_mutex);
Signature · 1 line
1.7.10.4
Pablo Neira Ayuso
maintainerPATCH 3/3 netfilter: nf_tables: fix missing rules flushing per table
In reply to Pablo Neira AyusoThis patch allows you to atomically remove all rules stored in a table via the NFT_MSG_DELRULE command. You only need to indicate the specific table and no chain to flush all rules stored in that table.
--- net/netfilter/nf_tables_api.c | 46 +++++++++++++++++++++++++++++------------ 1 file changed, 33 insertions(+), 13 deletions(-)
net/netfilter/nf_tables_api.c +33 -13
@@ -1717,6 +1717,19 @@ nf_tables_delrule_one(struct nft_ctx *ctx, struct nft_rule *rule)return -ENOENT ; } +static int nf_table_delrule_by_chain (struct nft_ctx *ctx) +{ +struct nft_rule *rule; +int err; + +list_for_each_entry (rule, &ctx->chain->rules, list) { + err =nf_tables_delrule_one (ctx, rule); +if (err <0 ) +return err; + } +return 0 ; +} +static int nf_tables_delrule (struct sock *nlsk,struct sk_buff *skb,const struct nlmsghdr *nlh,const struct nlattr *const nla[])
@@ -1725,8 +1738,8 @@ static int nf_tables_delrule(struct sock *nlsk, struct sk_buff *skb,const struct nft_af_info *afi;struct net *net =sock_net (skb->sk);const struct nft_table *table; -struct nft_chain *chain; -struct nft_rule *rule, *tmp; +struct nft_chain *chain =NULL ; +struct nft_rule *rule;int family = nfmsg->nfgen_family, err =0 ;struct nft_ctx ctx;
@@ -1738,22 +1751,29 @@ static int nf_tables_delrule(struct sock *nlsk, struct sk_buff *skb,if (IS_ERR (table))return PTR_ERR (table); - chain =nf_tables_chain_lookup (table, nla[NFTA_RULE_CHAIN ]); -if (IS_ERR (chain)) -return PTR_ERR (chain); +if (nla[NFTA_RULE_CHAIN ]) { + chain =nf_tables_chain_lookup (table, nla[NFTA_RULE_CHAIN ]); +if (IS_ERR (chain)) +return PTR_ERR (chain); + }nft_ctx_init (&ctx, skb, nlh, afi, table, chain, nla); -if (nla[NFTA_RULE_HANDLE ]) { - rule =nf_tables_rule_lookup (chain, nla[NFTA_RULE_HANDLE ]); -if (IS_ERR (rule)) -return PTR_ERR (rule); +if (chain) { +if (nla[NFTA_RULE_HANDLE ]) { + rule =nf_tables_rule_lookup (chain, + nla[NFTA_RULE_HANDLE ]); +if (IS_ERR (rule)) +return PTR_ERR (rule); - err =nf_tables_delrule_one (&ctx, rule); - }else { -/* Remove all rules in this chain */ -list_for_each_entry_safe (rule, tmp, &chain->rules, list) { err =nf_tables_delrule_one (&ctx, rule); + }else { + err =nf_table_delrule_by_chain (&ctx); + } + }else { +list_for_each_entry (chain, &table->chains, list) { + ctx.chain = chain; + err =nf_table_delrule_by_chain (&ctx);if (err <0 )break ; }
Signature · 1 line
1.7.10.4
David Miller
maintainerFrom: Pablo Neira Ayuso <[email protected]>
Date: Sun, 8 Dec 2013 00:13:27 +0100
Quoted 9 lines
The following patchset contains three Netfilter fixes for your net tree, they are:
* fix incorrect comparison in the new netnet hash ipset type, from Dave Jones.
* fix splat in hashlimit due to missing removal of the content of its proc entry in netnamespaces, from Sergey Popovich.
Quoted 7 lines
* fix missing rule flushing operation by table in
nf_tables. Table flushing was already discussed back in October but this got lost and no patch has hit the tree to address this issue so far, from me.You can pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.gitmaster
Pulled, thanks Pablo.