Netfilter fixes for net
Subsystems (3)
Pablo Neira Ayuso
maintainercover Netfilter fixes for net
Hi,
The following patchset contains Netfilter fixes for net:
1) Check for interval validity in all concatenation fields in nft_set_pipapo, from Stefano Brivio.
2) Missing preemption disabled in conntrack and flowtable stat updates, from Xin Long.
3) Fix compilation warning when CONFIG_NF_CONNTRACK_MARK=n.
Except for 3) which was a bug introduced in a recent fix in 6.1-rc. Anything else, broken for several releases.
Please, pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git
Thanks.
----------------------------------------------------------------
The following changes since commit f2fc2280faabafc8df83ee007699d21f7a6301fe:
Merge branch 'wwan-iosm-fixes' (2022-11-28 11:31:59 +0000)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git HEAD
for you to fetch changes up to 1feeae071507ad65cf9f462a1bdd543a4bf89e71:
netfilter: ctnetlink: fix compilation warning after data race fixes in ct mark (2022-11-30 13:08:49 +0100)
----------------------------------------------------------------
Pablo Neira Ayuso (1):
netfilter: ctnetlink: fix compilation warning after data race fixes in ct mark
Stefano Brivio (1):
netfilter: nft_set_pipapo: Actually validate intervals in fields after the first one
Xin Long (2):
netfilter: flowtable_offload: fix using __this_cpu_add in preemptible
netfilter: conntrack: fix using __this_cpu_add in preemptible
net/netfilter/nf_conntrack_core.c | 6 +++--- net/netfilter/nf_conntrack_netlink.c | 19 ++++++++++--------- net/netfilter/nf_flow_table_offload.c | 6 +++--- net/netfilter/nft_set_pipapo.c | 5 +++-- 4 files changed, 19 insertions(+), 17 deletions(-)
Pablo Neira Ayuso
maintainerPATCH 1/4 netfilter: nft_set_pipapo: Actually validate intervals in fields after the first one
From: Stefano Brivio <[email protected]>
Embarrassingly, nft_pipapo_insert() checked for interval validity in the first field only.
The start_p and end_p pointers were reset to key data from the first field at every iteration of the loop which was supposed to go over the set fields.
--- net/netfilter/nft_set_pipapo.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/netfilter/nft_set_pipapo.c +3 -2
@@ -1162,6 +1162,7 @@ static int nft_pipapo_insert(const struct net *net, const struct nft_set *set,struct nft_pipapo_match *m = priv->clone;u8 genmask =nft_genmask_next (net);struct nft_pipapo_field *f; +const u8 *start_p, *end_p;int i, bsize_max, err =0 ;if (nft_set_ext_exists (ext,NFT_SET_EXT_KEY_END ))
@@ -1202,9 +1203,9 @@ static int nft_pipapo_insert(const struct net *net, const struct nft_set *set, }/* Validate */ + start_p = start; + end_p = end;nft_pipapo_for_each_field (f, i, m) { -const u8 *start_p = start, *end_p = end; -if (f->rules >= (unsigned long )NFT_PIPAPO_RULE0_MAX )return -ENOSPC ;
Signature · 1 line
2.30.2
Re: [PATCH net 1/4] netfilter: nft_set_pipapo: Actually validate intervals in fields after the first one
This series was applied to netdev/net.git (master) by Pablo Neira Ayuso <[email protected]>:
Hello:
This series was applied to netdev/net.git (master) by Pablo Neira Ayuso <[email protected]>:
Quoted 10 lines · On Wed, 30 Nov 2022 13:19:31 +0100 you wrote:
From: Stefano Brivio <[email protected]>
Embarrassingly,
nft_pipapo_insert()checked for interval validity in the first field only.The
start_pandend_ppointers were reset to key data from the first field at every iteration of the loop which was supposed to go over the set fields.[...]
Here is the summary with links:
- [net,1/4] netfilter: nft_set_pipapo: Actually validate intervals in fields after the first one
https://git.kernel.org/netdev/net/c/97d4d394b587 - [net,2/4] netfilter: flowtable_offload: fix using __this_cpu_add in preemptible https://git.kernel.org/netdev/net/c/a81047154e7c - [net,3/4] netfilter: conntrack: fix using __this_cpu_add in preemptible https://git.kernel.org/netdev/net/c/9464d0b68f11 - [net,4/4] netfilter: ctnetlink: fix compilation warning after data race fixes in ct mark https://git.kernel.org/netdev/net/c/1feeae071507
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
Pablo Neira Ayuso
maintainerPATCH 2/4 netfilter: flowtable_offload: fix using __this_cpu_add in preemptible
In reply to Pablo Neira AyusoFrom: Xin Long <[email protected]>
flow_offload_queue_work() can be called in workqueue without bh disabled, like the call trace showed in my act_ct testing, calling NF_FLOW_TABLE_STAT_INC() there would cause a call trace:
BUG: using __this_cpu_add() in preemptible [00000000] code: kworker/u4:0/138560 caller is flow_offload_queue_work+0xec/0x1b0 [nf_flow_table] Workqueue: act_ct_workqueue tcf_ct_flow_table_cleanup_work [act_ct] Call Trace: <TASK> dump_stack_lvl+0x33/0x46 check_preemption_disabled+0xc3/0xf0 flow_offload_queue_work+0xec/0x1b0 [nf_flow_table] nf_flow_table_iterate+0x138/0x170 [nf_flow_table] nf_flow_table_free+0x140/0x1a0 [nf_flow_table] tcf_ct_flow_table_cleanup_work+0x2f/0x2b0 [act_ct] process_one_work+0x6a3/0x1030 worker_thread+0x8a/0xdf0
This patch fixes it by using NF_FLOW_TABLE_STAT_INC_ATOMIC() instead in flow_offload_queue_work().
Note that for FLOW_CLS_REPLACE branch in flow_offload_queue_work(), it may not be called in preemptible path, but it's good to use NF_FLOW_TABLE_STAT_INC_ATOMIC() for all cases in flow_offload_queue_work().
--- net/netfilter/nf_flow_table_offload.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/netfilter/nf_flow_table_offload.c +3 -3
@@ -997,13 +997,13 @@ static void flow_offload_queue_work(struct flow_offload_work *offload)struct net *net =read_pnet (&offload->flowtable->net);if (offload->cmd ==FLOW_CLS_REPLACE ) { -NF_FLOW_TABLE_STAT_INC (net, count_wq_add); +NF_FLOW_TABLE_STAT_INC_ATOMIC (net, count_wq_add);queue_work (nf_flow_offload_add_wq, &offload->work); }else if (offload->cmd ==FLOW_CLS_DESTROY ) { -NF_FLOW_TABLE_STAT_INC (net, count_wq_del); +NF_FLOW_TABLE_STAT_INC_ATOMIC (net, count_wq_del);queue_work (nf_flow_offload_del_wq, &offload->work); }else { -NF_FLOW_TABLE_STAT_INC (net, count_wq_stats); +NF_FLOW_TABLE_STAT_INC_ATOMIC (net, count_wq_stats);queue_work (nf_flow_offload_stats_wq, &offload->work); } }
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 3/4 netfilter: conntrack: fix using __this_cpu_add in preemptible
In reply to Pablo Neira AyusoFrom: Xin Long <[email protected]>
Currently in nf_conntrack_hash_check_insert(), when it fails in nf_ct_ext_valid_pre/post(), NF_CT_STAT_INC() will be called in the preemptible context, a call trace can be triggered:
BUG: using __this_cpu_add() in preemptible [00000000] code: conntrack/1636
caller is nf_conntrack_hash_check_insert+0x45/0x430 [nf_conntrack]
Call Trace:
<TASK>
dump_stack_lvl+0x33/0x46
check_preemption_disabled+0xc3/0xf0
nf_conntrack_hash_check_insert+0x45/0x430 [nf_conntrack]
ctnetlink_create_conntrack+0x3cd/0x4e0 [nf_conntrack_netlink]
ctnetlink_new_conntrack+0x1c0/0x450 [nf_conntrack_netlink]
nfnetlink_rcv_msg+0x277/0x2f0 [nfnetlink]
netlink_rcv_skb+0x50/0x100
nfnetlink_rcv+0x65/0x144 [nfnetlink]
netlink_unicast+0x1ae/0x290
netlink_sendmsg+0x257/0x4f0
sock_sendmsg+0x5f/0x70This patch is to fix it by changing to use NF_CT_STAT_INC_ATOMIC() for nf_ct_ext_valid_pre/post() check in nf_conntrack_hash_check_insert(), as well as nf_ct_ext_valid_post() in __nf_conntrack_confirm().
Note that nf_ct_ext_valid_pre() check in __nf_conntrack_confirm() is safe to use NF_CT_STAT_INC(), as it's under local_bh_disable().
--- net/netfilter/nf_conntrack_core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/netfilter/nf_conntrack_core.c +3 -3
@@ -891,7 +891,7 @@ nf_conntrack_hash_check_insert(struct nf_conn *ct) zone =nf_ct_zone (ct);if (!nf_ct_ext_valid_pre (ct->ext)) { -NF_CT_STAT_INC (net, insert_failed); +NF_CT_STAT_INC_ATOMIC (net, insert_failed);return -ETIMEDOUT ; }
@@ -938,7 +938,7 @@ nf_conntrack_hash_check_insert(struct nf_conn *ct)if (!nf_ct_ext_valid_post (ct->ext)) {nf_ct_kill (ct); -NF_CT_STAT_INC (net, drop); +NF_CT_STAT_INC_ATOMIC (net, drop);return -ETIMEDOUT ; }
@@ -1275,7 +1275,7 @@ __nf_conntrack_confirm(struct sk_buff *skb)*/ if (!nf_ct_ext_valid_post (ct->ext)) {nf_ct_kill (ct); -NF_CT_STAT_INC (net, drop); +NF_CT_STAT_INC_ATOMIC (net, drop);return NF_DROP ; }
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 4/4 netfilter: ctnetlink: fix compilation warning after data race fixes in ct mark
In reply to Pablo Neira AyusoAll warnings (new ones prefixed by >>):
net/netfilter/nf_conntrack_netlink.c: In function '__ctnetlink_glue_build':
Quoted 1 line
Quoted 1 line
net/netfilter/nf_conntrack_netlink.c:2674:13: warning: unused variable 'mark' [-Wunused-variable]
2674 | u32 mark;
| ^~~~--- net/netfilter/nf_conntrack_netlink.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
net/netfilter/nf_conntrack_netlink.c +10 -9
@@ -328,8 +328,13 @@ ctnetlink_dump_timestamp(struct sk_buff *skb, const struct nf_conn *ct) }#ifdef CONFIG_NF_CONNTRACK_MARK -static int ctnetlink_dump_mark (struct sk_buff *skb,u32 mark) +static int ctnetlink_dump_mark (struct sk_buff *skb,const struct nf_conn *ct) { +u32 mark =READ_ONCE (ct->mark); + +if (!mark) +return 0 ; +if (nla_put_be32 (skb,CTA_MARK ,htonl (mark))) goto nla_put_failure;return 0 ;
@@ -543,7 +548,7 @@ static int ctnetlink_dump_extinfo(struct sk_buff *skb,static int ctnetlink_dump_info (struct sk_buff *skb,struct nf_conn *ct) { if (ctnetlink_dump_status(skb, ct) < 0 || - ctnetlink_dump_mark(skb, READ_ONCE(ct->mark)) < 0 || + ctnetlink_dump_mark(skb, ct) < 0 || ctnetlink_dump_secctx(skb, ct) < 0 || ctnetlink_dump_id(skb, ct) < 0 || ctnetlink_dump_use(skb, ct) < 0 ||
@@ -722,7 +727,6 @@ ctnetlink_conntrack_event(unsigned int events, const struct nf_ct_event *item)struct sk_buff *skb;unsigned int type;unsigned int flags =0 , group; -u32 mark;int err;if (events & (1 <<IPCT_DESTROY )) {
@@ -827,9 +831,8 @@ ctnetlink_conntrack_event(unsigned int events, const struct nf_ct_event *item) }#ifdef CONFIG_NF_CONNTRACK_MARK - mark =READ_ONCE (ct->mark); -if ((events & (1 <<IPCT_MARK ) || mark) && -ctnetlink_dump_mark (skb, mark) <0 ) +if (events & (1 <<IPCT_MARK ) && +ctnetlink_dump_mark (skb, ct) <0 ) goto nla_put_failure;#endif nlmsg_end (skb, nlh);
@@ -2671,7 +2674,6 @@ static int __ctnetlink_glue_build(struct sk_buff *skb, struct nf_conn *ct) {const struct nf_conntrack_zone *zone;struct nlattr *nest_parms; -u32 mark; zone =nf_ct_zone (ct);
@@ -2733,8 +2735,7 @@ static int __ctnetlink_glue_build(struct sk_buff *skb, struct nf_conn *ct) goto nla_put_failure;#ifdef CONFIG_NF_CONNTRACK_MARK - mark =READ_ONCE (ct->mark); -if (mark &&ctnetlink_dump_mark (skb, mark) <0 ) +if (ctnetlink_dump_mark (skb, ct) <0 ) goto nla_put_failure;#endif if (ctnetlink_dump_labels (skb, ct) <0 )
Signature · 1 line
2.30.2