netfilter updates for net-next
Subsystems (4)
Florian Westphal
maintainercover netfilter updates for net-next
Hello,
This batch contains a few updates for your *net-next* tree. First patch resolves a fortify warning by wrapping the to-be-copied members via struct_group.
Second patch replaces array[0] with array[] in ebtables uapi. Both changes from GONG Ruiqi.
The largest chunk is replacement of strncpy with strscpy_pad() in netfilter, from Justin Stitt.
Last patch, from myself, aborts ruleset validation if a fatal signal is pending, this speeds up process exit.
The following changes since commit 43c2817225fce05701f062a996255007481935e2:
net: remove unnecessary input parameter 'how' in ifdown function (2023-08-22 13:19:02 +0200)
are available in the Git repository at:
https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git tags/nf-next-23-08-22
for you to fetch changes up to 169384fbe8513185499bcbb817d198e6a63eb37e:
netfilter: nf_tables: allow loop termination for pending fatal signal (2023-08-22 15:14:32 +0200)
----------------------------------------------------------------
nf-next pull request 2023-08-22
----------------------------------------------------------------
Florian Westphal (1):
netfilter: nf_tables: allow loop termination for pending fatal signal
GONG, Ruiqi (2):
netfilter: ebtables: fix fortify warnings in size_entry_mwt()
netfilter: ebtables: replace zero-length array members
Justin Stitt (7):
netfilter: ipset: refactor deprecated strncpy
netfilter: nf_tables: refactor deprecated strncpy
netfilter: nf_tables: refactor deprecated strncpy
netfilter: nft_osf: refactor deprecated strncpy
netfilter: nft_meta: refactor deprecated strncpy
netfilter: x_tables: refactor deprecated strncpy
netfilter: xtables: refactor deprecated strncpy
include/uapi/linux/netfilter_bridge/ebtables.h | 22 ++++++++++++---------- net/bridge/netfilter/ebtables.c | 3 +-- net/netfilter/ipset/ip_set_core.c | 10 +++++----- net/netfilter/nf_tables_api.c | 6 ++++++ net/netfilter/nft_ct.c | 2 +- net/netfilter/nft_fib.c | 2 +- net/netfilter/nft_meta.c | 6 +++--- net/netfilter/nft_osf.c | 6 +++--- net/netfilter/x_tables.c | 5 ++--- net/netfilter/xt_repldata.h | 2 +- 10 files changed, 35 insertions(+), 29 deletions(-)
Florian Westphal
maintainerPATCH 1/10 netfilter: ebtables: fix fortify warnings in size_entry_mwt()
From: "GONG, Ruiqi" <[email protected]>
When compiling with gcc 13 and CONFIG_FORTIFY_SOURCE=y, the following warning appears:
In function ‘fortify_memcpy_chk’,
inlined from ‘size_entry_mwt’ at net/bridge/netfilter/ebtables.c:2118:2:./include/linux/fortify-string.h:592:25: error: call to ‘__read_overflow2_field’ declared with attribute warning: detected read beyond size of field (2nd parameter); maybe use struct_group()? [-Werror=attribute-warning]
592 | __read_overflow2_field(q_size_field, size);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~The compiler is complaining:
memcpy(&offsets[1], &entry->watchers_offset,
sizeof(offsets) - sizeof(offsets[0]));
where memcpy reads beyong &entry->watchers_offset to copy {watchers,target,next}_offset altogether into offsets[]. Silence the warning by wrapping these three up via struct_group().
--- include/uapi/linux/netfilter_bridge/ebtables.h | 14 ++++++++------ net/bridge/netfilter/ebtables.c | 3 +-- 2 files changed, 9 insertions(+), 8 deletions(-)
include/uapi/linux/netfilter_bridge/ebtables.h +8 -6
@@ -182,12 +182,14 @@ struct ebt_entry {unsigned char sourcemsk[ETH_ALEN ];unsigned char destmac[ETH_ALEN ];unsigned char destmsk[ETH_ALEN ]; -/* sizeof ebt_entry + matches */ -unsigned int watchers_offset; -/* sizeof ebt_entry + matches + watchers */ -unsigned int target_offset; -/* sizeof ebt_entry + matches + watchers + target */ -unsigned int next_offset; + __struct_group(/* no tag */, offsets, /* no attrs */, +/* sizeof ebt_entry + matches */ + unsigned int watchers_offset; +/* sizeof ebt_entry + matches + watchers */ +unsigned int target_offset; +/* sizeof ebt_entry + matches + watchers + target */ +unsigned int next_offset; + ); unsigned char elems[0] __attribute__ ((aligned (__alignof__(struct ebt_replace)))); };
net/bridge/netfilter/ebtables.c +1 -2
@@ -2115,8 +2115,7 @@ static int size_entry_mwt(const struct ebt_entry *entry, const unsigned char *bareturn ret; offsets[0 ] =sizeof (struct ebt_entry );/* matches come first */ -memcpy (&offsets[1 ], &entry->watchers_offset, -sizeof (offsets) -sizeof (offsets[0 ])); +memcpy (&offsets[1 ], &entry->offsets,sizeof (entry->offsets));if (state->buf_kern_start) { buf_start = state->buf_kern_start + state->buf_kern_offset;
Signature · 1 line
2.41.0
Re: [PATCH net-next 01/10] netfilter: ebtables: fix fortify warnings in size_entry_mwt()
This series was applied to netdev/net-next.git (main) by Florian Westphal <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (main) by Florian Westphal <[email protected]>:
Quoted 10 lines · On Tue, 22 Aug 2023 17:43:22 +0200 you wrote:
From: "GONG, Ruiqi" <[email protected]>
When compiling with gcc 13 and
CONFIG_FORTIFY_SOURCE=y, the following warning appears:In function ‘fortify_memcpy_chk’,
inlined from ‘size_entry_mwt’ atnet/bridge/netfilter/ebtables.c:2118:2:./include/linux/fortify-string.h:592:25: error: call to ‘__read_overflow2_field’ declared with attribute warning: detected read beyond size of field (2nd parameter); maybe usestruct_group()? [-Werror=attribute-warning]
Quoted 4 lines
592 | __read_overflow2_field(q_size_field, size); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~[...]
Here is the summary with links:
- [net-next,01/10] netfilter: ebtables: fix fortify warnings in size_entry_mwt()
https://git.kernel.org/netdev/net-next/c/a7ed3465daa2 - [net-next,02/10] netfilter: ebtables: replace zero-length array members https://git.kernel.org/netdev/net-next/c/a2f02c9920b2 - [net-next,03/10] netfilter: ipset: refactor deprecated strncpy https://git.kernel.org/netdev/net-next/c/e53314034b23 - [net-next,04/10] netfilter: nf_tables: refactor deprecated strncpy https://git.kernel.org/netdev/net-next/c/6cdd75a4a66b - [net-next,05/10] netfilter: nf_tables: refactor deprecated strncpy https://git.kernel.org/netdev/net-next/c/7457af8bf994 - [net-next,06/10] netfilter: nft_osf: refactor deprecated strncpy https://git.kernel.org/netdev/net-next/c/6d87a4eae89e - [net-next,07/10] netfilter: nft_meta: refactor deprecated strncpy https://git.kernel.org/netdev/net-next/c/ad156c23d65c - [net-next,08/10] netfilter: x_tables: refactor deprecated strncpy https://git.kernel.org/netdev/net-next/c/06f7d3c3f82c - [net-next,09/10] netfilter: xtables: refactor deprecated strncpy https://git.kernel.org/netdev/net-next/c/aa222dd190d6 - [net-next,10/10] netfilter: nf_tables: allow loop termination for pending fatal signal https://git.kernel.org/netdev/net-next/c/169384fbe851
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
Florian Westphal
maintainerPATCH 2/10 netfilter: ebtables: replace zero-length array members
In reply to Florian WestphalFrom: "GONG, Ruiqi" <[email protected]>
As suggested by Kees[1], replace the old-style 0-element array members of multiple structs in ebtables.h with modern C99 flexible array.
[1]: https://lore.kernel.org/all/[email protected]/
[ [email protected]:
keep struct ebt_entry_target as-is, causes compiler warning:
"variable sized type 'struct ebt_entry_target' not at the end of a struct or class is a GNU extension" ]
--- include/uapi/linux/netfilter_bridge/ebtables.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
include/uapi/linux/netfilter_bridge/ebtables.h +4 -4
@@ -87,7 +87,7 @@ struct ebt_entries {/* nr. of entries */ unsigned int nentries;/* entry list */ - char data[0] __attribute__ ((aligned (__alignof__(struct ebt_replace)))); + char data[] __attribute__ ((aligned (__alignof__(struct ebt_replace)))); };/* used for the bitmask of struct ebt_entry */
@@ -129,7 +129,7 @@ struct ebt_entry_match { } u;/* size of data */ unsigned int match_size; - unsigned char data[0] __attribute__ ((aligned (__alignof__(struct ebt_replace)))); + unsigned char data[] __attribute__ ((aligned (__alignof__(struct ebt_replace)))); };struct ebt_entry_watcher {
@@ -142,7 +142,7 @@ struct ebt_entry_watcher { } u;/* size of data */ unsigned int watcher_size; - unsigned char data[0] __attribute__ ((aligned (__alignof__(struct ebt_replace)))); + unsigned char data[] __attribute__ ((aligned (__alignof__(struct ebt_replace)))); };struct ebt_entry_target {
@@ -190,7 +190,7 @@ struct ebt_entry {/* sizeof ebt_entry + matches + watchers + target */ unsigned int next_offset; ); - unsigned char elems[0] __attribute__ ((aligned (__alignof__(struct ebt_replace)))); + unsigned char elems[] __attribute__ ((aligned (__alignof__(struct ebt_replace)))); }; static __inline__ struct ebt_entry_target *
Signature · 1 line
2.41.0
Florian Westphal
maintainerPATCH 3/10 netfilter: ipset: refactor deprecated strncpy
In reply to Florian WestphalFrom: Justin Stitt <[email protected]>
Use strscpy_pad instead of strncpy.
--- net/netfilter/ipset/ip_set_core.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
net/netfilter/ipset/ip_set_core.c +5 -5
@@ -872,7 +872,7 @@ ip_set_name_byindex(struct net *net, ip_set_id_t index, char *name)BUG_ON (!set);read_lock_bh (&ip_set_ref_lock); -strncpy (name, set->name,IPSET_MAXNAMELEN ); +strscpy_pad (name, set->name,IPSET_MAXNAMELEN );read_unlock_bh (&ip_set_ref_lock); }EXPORT_SYMBOL_GPL (ip_set_name_byindex);
@@ -1326,7 +1326,7 @@ static int ip_set_rename(struct sk_buff *skb, const struct nfnl_info *info, goto out; } } -strncpy (set->name, name2,IPSET_MAXNAMELEN ); +strscpy_pad (set->name, name2,IPSET_MAXNAMELEN ); out:write_unlock_bh (&ip_set_ref_lock);
@@ -1380,9 +1380,9 @@ static int ip_set_swap(struct sk_buff *skb, const struct nfnl_info *info,return -EBUSY ; } -strncpy (from_name, from->name,IPSET_MAXNAMELEN ); -strncpy (from->name, to->name,IPSET_MAXNAMELEN ); -strncpy (to->name, from_name,IPSET_MAXNAMELEN ); +strscpy_pad (from_name, from->name,IPSET_MAXNAMELEN ); +strscpy_pad (from->name, to->name,IPSET_MAXNAMELEN ); +strscpy_pad (to->name, from_name,IPSET_MAXNAMELEN );swap (from->ref, to->ref);ip_set (inst, from_id) = to;
Signature · 1 line
2.41.0
Florian Westphal
maintainerPATCH 4/10 netfilter: nf_tables: refactor deprecated strncpy
In reply to Florian WestphalFrom: Justin Stitt <[email protected]>
Prefer strscpy_pad over strncpy.
--- net/netfilter/nft_ct.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nft_ct.c +1 -1
@@ -108,7 +108,7 @@ static void nft_ct_get_eval(const struct nft_expr *expr, helper =rcu_dereference (help->helper);if (helper ==NULL ) goto err; -strncpy ((char *)dest, helper->name,NF_CT_HELPER_NAME_LEN ); +strscpy_pad ((char *)dest, helper->name,NF_CT_HELPER_NAME_LEN );return ;#ifdef CONFIG_NF_CONNTRACK_LABELS case NFT_CT_LABELS : {
Signature · 1 line
2.41.0
Florian Westphal
maintainerPATCH 5/10 netfilter: nf_tables: refactor deprecated strncpy
In reply to Florian WestphalFrom: Justin Stitt <[email protected]>
Prefer strscpy_pad over strncpy.
--- net/netfilter/nft_fib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nft_fib.c +1 -1
@@ -151,7 +151,7 @@ void nft_fib_store_result(void *reg, const struct nft_fib *priv,if (priv->flags &NFTA_FIB_F_PRESENT ) *dreg = !!dev;else -strncpy (reg, dev ? dev->name :"" ,IFNAMSIZ ); +strscpy_pad (reg, dev ? dev->name :"" ,IFNAMSIZ );break ;default :WARN_ON_ONCE (1 );
Signature · 1 line
2.41.0
Florian Westphal
maintainerPATCH 6/10 netfilter: nft_osf: refactor deprecated strncpy
In reply to Florian WestphalFrom: Justin Stitt <[email protected]>
Use strscpy_pad over strncpy for NUL-terminated strings.
We can also drop the + 1 from NFT_OSF_MAXGENRELEN + 1 since strscpy will guarantee NUL-termination.
--- net/netfilter/nft_osf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/netfilter/nft_osf.c +3 -3
@@ -23,7 +23,7 @@ static void nft_osf_eval(const struct nft_expr *expr, struct nft_regs *regs,struct nft_osf *priv =nft_expr_priv (expr);u32 *dest = ®s->data[priv->dreg];struct sk_buff *skb = pkt->skb; -char os_match[NFT_OSF_MAXGENRELEN +1 ]; +char os_match[NFT_OSF_MAXGENRELEN ];const struct tcphdr *tcp;struct nf_osf_data data;struct tcphdr _tcph;
@@ -45,7 +45,7 @@ static void nft_osf_eval(const struct nft_expr *expr, struct nft_regs *regs, }if (!nf_osf_find (skb, nf_osf_fingers, priv->ttl, &data)) { -strncpy ((char *)dest,"unknown" ,NFT_OSF_MAXGENRELEN ); +strscpy_pad ((char *)dest,"unknown" ,NFT_OSF_MAXGENRELEN ); }else {if (priv->flags &NFT_OSF_F_VERSION ) snprintf(os_match, NFT_OSF_MAXGENRELEN, "%s:%s",
@@ -53,7 +53,7 @@ static void nft_osf_eval(const struct nft_expr *expr, struct nft_regs *regs,else strscpy (os_match, data.genre,NFT_OSF_MAXGENRELEN ); -strncpy ((char *)dest, os_match,NFT_OSF_MAXGENRELEN ); +strscpy_pad ((char *)dest, os_match,NFT_OSF_MAXGENRELEN ); } }
Signature · 1 line
2.41.0
Florian Westphal
maintainerPATCH 7/10 netfilter: nft_meta: refactor deprecated strncpy
In reply to Florian WestphalFrom: Justin Stitt <[email protected]>
Prefer strscpy_pad to strncpy.
--- net/netfilter/nft_meta.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/netfilter/nft_meta.c +3 -3
@@ -185,12 +185,12 @@ static noinline bool nft_meta_get_eval_kind(enum nft_meta_keys key,case NFT_META_IIFKIND :if (!in || !in->rtnl_link_ops)return false; -strncpy ((char *)dest, in->rtnl_link_ops->kind,IFNAMSIZ ); +strscpy_pad ((char *)dest, in->rtnl_link_ops->kind,IFNAMSIZ );break ;case NFT_META_OIFKIND :if (!out || !out->rtnl_link_ops)return false; -strncpy ((char *)dest, out->rtnl_link_ops->kind,IFNAMSIZ ); +strscpy_pad ((char *)dest, out->rtnl_link_ops->kind,IFNAMSIZ );break ;default :return false;
@@ -206,7 +206,7 @@ static void nft_meta_store_ifindex(u32 *dest, const struct net_device *dev)static void nft_meta_store_ifname (u32 *dest,const struct net_device *dev) { -strncpy ((char *)dest, dev ? dev->name :"" ,IFNAMSIZ ); +strscpy_pad ((char *)dest, dev ? dev->name :"" ,IFNAMSIZ ); }static bool nft_meta_store_iftype (u32 *dest,const struct net_device *dev)
Signature · 1 line
2.41.0
Florian Westphal
maintainerPATCH 8/10 netfilter: x_tables: refactor deprecated strncpy
In reply to Florian WestphalFrom: Justin Stitt <[email protected]>
Prefer strscpy_pad to strncpy.
--- net/netfilter/x_tables.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
net/netfilter/x_tables.c +2 -3
@@ -768,7 +768,7 @@ void xt_compat_match_from_user(struct xt_entry_match *m, void **dstptr, m->u.user.match_size = msize;strscpy (name, match->name,sizeof (name));module_put (match->me); -strncpy (m->u.user.name, name,sizeof (m->u.user.name)); +strscpy_pad (m->u.user.name, name,sizeof (m->u.user.name)); *size += off; *dstptr += msize;
@@ -1148,7 +1148,7 @@ void xt_compat_target_from_user(struct xt_entry_target *t, void **dstptr, t->u.user.target_size = tsize;strscpy (name, target->name,sizeof (name));module_put (target->me); -strncpy (t->u.user.name, name,sizeof (t->u.user.name)); +strscpy_pad (t->u.user.name, name,sizeof (t->u.user.name)); *size += off; *dstptr += tsize;
@@ -2014,4 +2014,3 @@ static void __exit xt_fini(void)module_init (xt_init);module_exit (xt_fini); -
Signature · 1 line
2.41.0
Florian Westphal
maintainerPATCH 9/10 netfilter: xtables: refactor deprecated strncpy
In reply to Florian WestphalFrom: Justin Stitt <[email protected]>
Prefer strscpy_pad as it's a more robust interface whilst maintaing zero-padding behavior.
There may have existed a bug here due to both tbl->repl.name and info->name having a size of 32 as defined below:
| #define XT_TABLE_MAXNAMELEN 32
This may lead to buffer overreads in some situations -- strscpy solves this by guaranteeing NUL-termination of the dest buffer.
--- net/netfilter/xt_repldata.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/xt_repldata.h +1 -1
@@ -29,7 +29,7 @@if (tbl ==NULL ) \return NULL ; \ term = (struct type##_error *)&(((char *)tbl)[term_offset]); \ -strncpy (tbl->repl.name, info->name,sizeof (tbl->repl.name)); \ +strscpy_pad (tbl->repl.name, info->name,sizeof (tbl->repl.name)); \ *term = (struct type##_error)typ2##_ERROR_INIT; \ tbl->repl.valid_hooks = hook_mask; \ tbl->repl.num_entries = nhooks +1 ; \
Signature · 1 line
2.41.0
Florian Westphal
maintainerPATCH 10/10 netfilter: nf_tables: allow loop termination for pending fatal signal
In reply to Florian Westphalabort early so task can exit faster if a fatal signal is pending, no need to continue validation in that case.
--- net/netfilter/nf_tables_api.c | 6 ++++++ 1 file changed, 6 insertions(+)
net/netfilter/nf_tables_api.c +6 -0
@@ -3675,6 +3675,9 @@ int nft_chain_validate(const struct nft_ctx *ctx, const struct nft_chain *chain)return -EMLINK ;list_for_each_entry (rule, &chain->rules, list) { +if (fatal_signal_pending (current)) +return -EINTR ; +if (!nft_is_active_next (ctx->net, rule))continue ;
@@ -10479,6 +10482,9 @@ static int nf_tables_check_loops(const struct nft_ctx *ctx,if (ctx->chain == chain)return -ELOOP ; +if (fatal_signal_pending (current)) +return -EINTR ; +list_for_each_entry (rule, &chain->rules, list) {nft_rule_for_each_expr (expr, last, rule) {struct nft_immediate_expr *priv;
Signature · 1 line
2.41.0