Netfilter fixes for net
Subsystems (4)
Pablo Neira Ayuso
maintainercover Netfilter fixes for net
Hi,
The following patchset contains Netfilter fixes for net:
1) Fix a crash when stateful expression with its own gc callback is used in a set definition.
2) Skip IPv6 packets from any link-local address in IPv6 fib expression. Add a selftest for this scenario, from Florian Westphal.
Please, pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
Thank you!
----------------------------------------------------------------
The following changes since commit f2386cf7c5f4ff5d7b584f5d92014edd7df6c676:
net: lantiq: disable interrupt before sheduling NAPI (2021-06-08 19:16:32 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git HEAD
for you to fetch changes up to 12f36e9bf678a81d030ca1b693dcda62b55af7c5:
netfilter: nft_fib_ipv6: skip ipv6 packets from any to link-local (2021-06-09 21:11:03 +0200)
----------------------------------------------------------------
Florian Westphal (2):
selftests: netfilter: add fib test case
netfilter: nft_fib_ipv6: skip ipv6 packets from any to link-local
Pablo Neira Ayuso (1):
netfilter: nf_tables: initialize set before expression setup
net/ipv6/netfilter/nft_fib_ipv6.c | 22 ++- net/netfilter/nf_tables_api.c | 85 ++++++----- tools/testing/selftests/netfilter/Makefile | 2 +- tools/testing/selftests/netfilter/nft_fib.sh | 221 +++++++++++++++++++++++++++ 4 files changed, 283 insertions(+), 47 deletions(-) create mode 100755 tools/testing/selftests/netfilter/nft_fib.sh
Pablo Neira Ayuso
maintainerPATCH 1/3 netfilter: nf_tables: initialize set before expression setup
nft_set_elem_expr_alloc() needs an initialized set if expression sets on the NFT_EXPR_GC flag. Move set fields initialization before expression setup.
[4512935.019450] ================================================================== [4512935.019456] BUG: KASAN: null-ptr-deref in nft_set_elem_expr_alloc+0x84/0xd0 [nf_tables] [4512935.019487] Read of size 8 at addr 0000000000000070 by task nft/23532 [4512935.019494] CPU: 1 PID: 23532 Comm: nft Not tainted 5.12.0-rc4+ #48 [...] [4512935.019502] Call Trace: [4512935.019505] dump_stack+0x89/0xb4 [4512935.019512] ? nft_set_elem_expr_alloc+0x84/0xd0 [nf_tables] [4512935.019536] ? nft_set_elem_expr_alloc+0x84/0xd0 [nf_tables] [4512935.019560] kasan_report.cold.12+0x5f/0xd8 [4512935.019566] ? nft_set_elem_expr_alloc+0x84/0xd0 [nf_tables] [4512935.019590] nft_set_elem_expr_alloc+0x84/0xd0 [nf_tables] [4512935.019615] nf_tables_newset+0xc7f/0x1460 [nf_tables]
--- net/netfilter/nf_tables_api.c | 85 ++++++++++++++++++----------------- 1 file changed, 43 insertions(+), 42 deletions(-)
net/netfilter/nf_tables_api.c +43 -42
@@ -4364,13 +4364,45 @@ static int nf_tables_newset(struct sk_buff *skb, const struct nfnl_info *info, err =nf_tables_set_alloc_name (&ctx, set, name);kfree (name);if (err <0 ) - goto err_set_alloc_name; + goto err_set_name; + + udata =NULL ; +if (udlen) { + udata = set->data + size; +nla_memcpy (udata, nla[NFTA_SET_USERDATA ], udlen); + } + +INIT_LIST_HEAD (&set->bindings); +INIT_LIST_HEAD (&set->catchall_list); + set->table = table; +write_pnet (&set->net, net); + set->ops = ops; + set->ktype = ktype; + set->klen = desc.klen; + set->dtype = dtype; + set->objtype = objtype; + set->dlen = desc.dlen; + set->flags = flags; + set->size = desc.size; + set->policy = policy; + set->udlen = udlen; + set->udata = udata; + set->timeout = timeout; + set->gc_int = gc_int; + + set->field_count = desc.field_count; +for (i =0 ; i < desc.field_count; i++) + set->field_len[i] = desc.field_len[i]; + + err = ops->init (set, &desc, nla); +if (err <0 ) + goto err_set_init;if (nla[NFTA_SET_EXPR ]) { expr =nft_set_elem_expr_alloc (&ctx, set, nla[NFTA_SET_EXPR ]);if (IS_ERR (expr)) { err =PTR_ERR (expr); - goto err_set_alloc_name; + goto err_set_expr_alloc; } set->exprs[0 ] = expr; set->num_exprs++;
@@ -4381,75 +4413,44 @@ static int nf_tables_newset(struct sk_buff *skb, const struct nfnl_info *info,if (!(flags &NFT_SET_EXPR )) { err = -EINVAL ; - goto err_set_alloc_name; + goto err_set_expr_alloc; } i =0 ;nla_for_each_nested (tmp, nla[NFTA_SET_EXPRESSIONS ], left) {if (i ==NFT_SET_EXPR_MAX ) { err = -E2BIG ; - goto err_set_init; + goto err_set_expr_alloc; }if (nla_type (tmp) !=NFTA_LIST_ELEM ) { err = -EINVAL ; - goto err_set_init; + goto err_set_expr_alloc; } expr =nft_set_elem_expr_alloc (&ctx, set, tmp);if (IS_ERR (expr)) { err =PTR_ERR (expr); - goto err_set_init; + goto err_set_expr_alloc; } set->exprs[i++] = expr; set->num_exprs++; } } - udata =NULL ; -if (udlen) { - udata = set->data + size; -nla_memcpy (udata, nla[NFTA_SET_USERDATA ], udlen); - } - -INIT_LIST_HEAD (&set->bindings); -INIT_LIST_HEAD (&set->catchall_list); - set->table = table; -write_pnet (&set->net, net); - set->ops = ops; - set->ktype = ktype; - set->klen = desc.klen; - set->dtype = dtype; - set->objtype = objtype; - set->dlen = desc.dlen; - set->flags = flags; - set->size = desc.size; - set->policy = policy; - set->udlen = udlen; - set->udata = udata; - set->timeout = timeout; - set->gc_int = gc_int; set->handle =nf_tables_alloc_handle (table); - set->field_count = desc.field_count; -for (i =0 ; i < desc.field_count; i++) - set->field_len[i] = desc.field_len[i]; - - err = ops->init (set, &desc, nla); -if (err <0 ) - goto err_set_init; - err =nft_trans_set_add (&ctx,NFT_MSG_NEWSET , set);if (err <0 ) - goto err_set_trans; + goto err_set_expr_alloc;list_add_tail_rcu (&set->list, &table->sets); table->use++;return 0 ; -err_set_trans: - ops->destroy (set); -err_set_init: +err_set_expr_alloc:for (i =0 ; i < set->num_exprs; i++)nft_expr_destroy (&ctx, set->exprs[i]); -err_set_alloc_name: + + ops->destroy (set); +err_set_init:kfree (set->name); err_set_name:kvfree (set);
Signature · 1 line
2.20.1
Re: [PATCH net 1/3] netfilter: nf_tables: initialize set before expression setup
This series was applied to netdev/net.git (refs/heads/master):
Hello:
This series was applied to netdev/net.git (refs/heads/master):
Quoted 18 lines · On Thu, 10 Jun 2021 18:54:56 +0200 you wrote:
nft_set_elem_expr_alloc()needs an initialized set if expression sets on theNFT_EXPR_GCflag. Move set fields initialization before expression setup.[4512935.019450] ================================================================== [4512935.019456] BUG: KASAN: null-ptr-deref in nft_set_elem_expr_alloc+0x84/0xd0 [nf_tables] [4512935.019487] Read of size 8 at addr 0000000000000070 by task nft/23532 [4512935.019494] CPU: 1 PID: 23532 Comm: nft Not tainted 5.12.0-rc4+ #48 [...] [4512935.019502] Call Trace: [4512935.019505] dump_stack+0x89/0xb4 [4512935.019512] ? nft_set_elem_expr_alloc+0x84/0xd0 [nf_tables] [4512935.019536] ? nft_set_elem_expr_alloc+0x84/0xd0 [nf_tables] [4512935.019560] kasan_report.cold.12+0x5f/0xd8 [4512935.019566] ? nft_set_elem_expr_alloc+0x84/0xd0 [nf_tables] [4512935.019590] nft_set_elem_expr_alloc+0x84/0xd0 [nf_tables] [4512935.019615] nf_tables_newset+0xc7f/0x1460 [nf_tables]
Quoted 1 line
[...]
Here is the summary with links:
- [net,1/3] netfilter: nf_tables: initialize set before expression setup
https://git.kernel.org/netdev/net/c/ad9f151e560b - [net,2/3] selftests: netfilter: add fib test case https://git.kernel.org/netdev/net/c/82944421243e - [net,3/3] netfilter: nft_fib_ipv6: skip ipv6 packets from any to link-local https://git.kernel.org/netdev/net/c/12f36e9bf678
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
Pablo Neira Ayuso
maintainerPATCH 2/3 selftests: netfilter: add fib test case
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
There is a bug report on netfilter.org bugzilla pointing to fib expression dropping ipv6 DAD packets.
Add a test case that demonstrates this problem.
Next patch excludes icmpv6 packets coming from any to linklocal.
--- tools/testing/selftests/netfilter/Makefile | 2 +- tools/testing/selftests/netfilter/nft_fib.sh | 221 +++++++++++++++++++ 2 files changed, 222 insertions(+), 1 deletion(-) create mode 100755 tools/testing/selftests/netfilter/nft_fib.sh
tools/testing/selftests/netfilter/Makefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 # Makefile for netfilter selftests -TEST_PROGS := nft_trans_stress.sh nft_nat.sh bridge_brouter.sh \ +TEST_PROGS := nft_trans_stress.sh nft_fib.sh nft_nat.sh bridge_brouter.sh \ conntrack_icmp_related.sh nft_flowtable.sh ipvs.sh \ nft_concat_range.sh nft_conntrack_helper.sh \ nft_queue.sh nft_meta.sh nf_nat_edemux.sh \
tools/testing/selftests/netfilter/nft_fib.sh new file +221 -0
221 lines not on this page · raw message
Signature · 1 line
2.20.1
Pablo Neira Ayuso
maintainerPATCH 3/3 netfilter: nft_fib_ipv6: skip ipv6 packets from any to link-local
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
The ip6tables rpfilter match has an extra check to skip packets with "::" source address.
Extend this to ipv6 fib expression. Else ipv6 duplicate address detection packets will fail rpf route check -- lookup returns -ENETUNREACH.
While at it, extend the prerouting check to also cover the ingress hook.
--- net/ipv6/netfilter/nft_fib_ipv6.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-)
net/ipv6/netfilter/nft_fib_ipv6.c +18 -4
@@ -135,6 +135,17 @@ void nft_fib6_eval_type(const struct nft_expr *expr, struct nft_regs *regs, }EXPORT_SYMBOL_GPL (nft_fib6_eval_type); +static bool nft_fib_v6_skip_icmpv6 (const struct sk_buff *skb,u8 next,const struct ipv6hdr *iph) +{ +if (likely (next !=IPPROTO_ICMPV6 )) +return false; + +if (ipv6_addr_type (&iph->saddr) !=IPV6_ADDR_ANY ) +return false; + +return ipv6_addr_type (&iph->daddr) &IPV6_ADDR_LINKLOCAL ; +} +void nft_fib6_eval (const struct nft_expr *expr,struct nft_regs *regs,const struct nft_pktinfo *pkt) {
@@ -163,10 +174,13 @@ void nft_fib6_eval(const struct nft_expr *expr, struct nft_regs *regs, lookup_flags =nft_fib6_flowi_init (&fl6, priv, pkt, oif, iph); -if (nft_hook (pkt) ==NF_INET_PRE_ROUTING && -nft_fib_is_loopback (pkt->skb,nft_in (pkt))) { -nft_fib_store_result (dest, priv,nft_in (pkt)); -return ; +if (nft_hook (pkt) ==NF_INET_PRE_ROUTING || +nft_hook (pkt) ==NF_INET_INGRESS ) { +if (nft_fib_is_loopback (pkt->skb,nft_in (pkt)) || +nft_fib_v6_skip_icmpv6 (pkt->skb, pkt->tprot, iph)) { +nft_fib_store_result (dest, priv,nft_in (pkt)); +return ; + } } *dest =0 ;
Signature · 1 line
2.20.1