netfilter: nf_tables_netdev_event UAF of binding chain
Subsystems (2)
PATCH 1/1 netfilter: nf_tables_netdev_event UAF of binding chain
Hello,
Please consider a backport of the following use-after-free to the longterm trees that still have it: 6.12, 6.6, and 6.1. 6.18 and newer are not affected.
There is no single upstream commit to cherry-pick. On current linux.git the netdev notifier no longer calls __nft_release_basechain(); it only unregisters the per-device hook. That change arrived as part of the netdev-hook rework and does not apply to these stable trees.
Bug
===
nf_tables_netdev_event() walks table->chains with list_for_each_entry_safe. On NETDEV_UNREGISTER of the last hook, nft_netdev_event() calls __nft_release_basechain(). Releasing the base chain deactivates a JUMP to an NFT_CHAIN_BINDING chain, which nft_chain_del()s that successor and nft_immediate_destroy() kfree()s it. The walker's saved nr still points at the freed nft_chain.
Still present in:
linux-6.12.y (6.12.111) nft_chain_filter.c: __nft_release_basechain() linux-6.6.y (6.6.157) linux-6.1.y (6.1.188)
Gone in linux-6.18.y and linux-7.0.y.
Reproducer (nftables 1.0.9)
===========================
An anonymous jump is what sets NFT_CHAIN_BINDING (chain flags 0x4). Commit the base chain first, then add the jump in a second command. Chains are appended to table->chains, and the walker frees the chain that follows the base chain. One nft -f that contains both creates the binding chain first and does not hit this path.
ip link add br0 type bridge
ip link set br0 up
nft -f - <<'EOF'
table netdev t {
chain in {
type filter hook ingress device "br0" priority 0; policy accept;
}
}
EOF
nft add rule netdev t in 'jump { accept; }'
ip link del br0The namespace must still be alive. Netns teardown is too late: nft pernet exit wins that race. Needs CAP_NET_ADMIN. Do not run on a host kernel.
Confirmed on Linux 6.6.144 KASAN (same __nft_release_basechain() walk as 6.6.y and 6.12.y). I have not booted 6.12.111 or 6.1.188.
BUG: KASAN: slab-use-after-free in nf_tables_netdev_event+0x635/0x970
Read of size 8 at addr ff110000037faa20 by task ip/229
Freed by task 229:
nft_immediate_destroy
__nft_release_basechain_now
__nft_release_basechain
nf_tables_netdev_eventThe read is 8 bytes at offset 32 of a kmalloc-128 object (nft_chain.list).
Thanks,
Yu Junzhe
FuzzAnything <[email protected]>
Greg Kroah-Hartman
maintainerQuoted 10 lines · Yu Junzhe
Hello,
Please consider a backport of the following use-after-free to the longterm trees that still have it: 6.12, 6.6, and 6.1. 6.18 and newer are not affected.
There is no single upstream commit to cherry-pick. On current linux.git the netdev notifier no longer calls
__nft_release_basechain(); it only unregisters the per-device hook. That change arrived as part of the netdev-hook rework and does not apply to these stable trees.
Great, please provide a working, and tested, patch and we will glad to review it and apply it if it passes review.
Or you can just submit the same upstream patches backported, which is probably easier.
thanks,
greg k-h
Hello Greg,
The two upstream commits cherry-pick cleanly. They are Phil Sutter's "Tolerate chains with no remaining hooks" (fc0133428e7a) and "Simplify chain netdev notifier" (375f222800bc). The second is the follow-up that makes list_for_each_entry() safe once the notifier no longer deletes the base chain.
The 6.12 diff does not apply to 6.6 or 6.1: those trees still check NETDEV_CHANGENAME in nf_tables_netdev_event(). So this is two series, not one:
[PATCH 6.12 1/2] and [PATCH 6.12 2/2]
[PATCH 6.6 6.1 1/2] and [PATCH 6.6 6.1 2/2]
The 6.6 series applies cleanly on linux-6.1.y as well. Neither series touches the rest of the netdev-hook rework.
Tested on KASAN guests, with the anonymous-jump ruleset from the original report (base chain committed, then nft add rule ... 'jump { accept; }', then ip link del br0):
6.12.111 no slab-use-after-free in nf_tables_netdev_event 6.6.157 no slab-use-after-free in nf_tables_netdev_event 6.1.188 no slab-use-after-free in nf_tables_netdev_event
The same ruleset hits that KASAN bug on unpatched 6.6.144.
Thanks,
Yu Junzhe
PATCH 1/2 netfilter: nf_tables: Tolerate chains with no remaining hooks
From: Phil Sutter <[email protected]>
commit fc0133428e7ad65aa6b7c8e65ccfe86e469e4512 upstream.
Do not drop a netdev-family chain if the last interface it is registered for vanishes. Users dumping and storing the ruleset upon shutdown to restore it upon next boot may otherwise lose the chain and all contained rules. They will still lose the list of devices, a later patch will fix that. For now, this aligns the event handler's behaviour with that for flowtables.
The controversal situation at netns exit should be no problem here:
event handler will unregister the hooks, core nftables cleanup code will drop the chain itself.
--- include/net/netfilter/nf_tables.h | 2 -- net/netfilter/nf_tables_api.c | 41 ------------------------------- net/netfilter/nft_chain_filter.c | 29 ++++++---------------- 3 files changed, 7 insertions(+), 65 deletions(-)
include/net/netfilter/nf_tables.h +0 -2
@@ -1238,8 +1238,6 @@ static inline bool nft_is_base_chain(const struct nft_chain *chain)return chain->flags &NFT_CHAIN_BASE ; } -int __nft_release_basechain (struct nft_ctx *ctx); -unsigned int nft_do_chain (struct nft_pktinfo *pkt,void *priv);static inline bool nft_use_inc (u32 *use)
net/netfilter/nf_tables_api.c +0 -41
47 lines not on this page · raw message
net/netfilter/nft_chain_filter.c +7 -22
@@ -322,34 +322,19 @@ static void nft_netdev_event(unsigned long event, struct net_device *dev, struct nft_ctx *ctx) {struct nft_base_chain *basechain =nft_base_chain (ctx->chain); -struct nft_hook *hook, *found =NULL ; -int n =0 ; +struct nft_hook *hook;list_for_each_entry (hook, &basechain->hook_list, list) { -if (hook->ops.dev == dev) - found = hook; - - n++; - } -if (!found) -return ; +if (hook->ops.dev != dev) +continue ; -if (n >1 ) {if (!(ctx->chain->table->flags &NFT_TABLE_F_DORMANT )) -nf_unregister_net_hook (ctx->net, &found->ops); +nf_unregister_net_hook (ctx->net, &hook->ops); -list_del_rcu (&found->list); -kfree_rcu (found, rcu); -return ; +list_del_rcu (&hook->list); +kfree_rcu (hook, rcu); +break ; } - -/* UNREGISTER events are also happening on netns exit. -* -* Although nf_tables core releases all tables/chains, only this event -* handler provides guarantee that hook->ops.dev is still accessible, -* so we cannot skip exiting net namespaces. -*/ -__nft_release_basechain (ctx); } static int nf_tables_netdev_event(struct notifier_block *this,
Signature · 1 line
2.53.0
PATCH 1/2 netfilter: nf_tables: Tolerate chains with no remaining hooks
In reply to Yu JunzheFrom: Phil Sutter <[email protected]>
commit fc0133428e7ad65aa6b7c8e65ccfe86e469e4512 upstream.
Do not drop a netdev-family chain if the last interface it is registered for vanishes. Users dumping and storing the ruleset upon shutdown to restore it upon next boot may otherwise lose the chain and all contained rules. They will still lose the list of devices, a later patch will fix that. For now, this aligns the event handler's behaviour with that for flowtables.
The controversal situation at netns exit should be no problem here:
event handler will unregister the hooks, core nftables cleanup code will drop the chain itself.
--- include/net/netfilter/nf_tables.h | 2 -- net/netfilter/nf_tables_api.c | 41 ------------------------------- net/netfilter/nft_chain_filter.c | 29 ++++++---------------- 3 files changed, 7 insertions(+), 65 deletions(-)
include/net/netfilter/nf_tables.h +0 -2
@@ -1233,8 +1233,6 @@ static inline bool nft_is_base_chain(const struct nft_chain *chain)return chain->flags &NFT_CHAIN_BASE ; } -int __nft_release_basechain (struct nft_ctx *ctx); -unsigned int nft_do_chain (struct nft_pktinfo *pkt,void *priv);static inline bool nft_use_inc (u32 *use)
net/netfilter/nf_tables_api.c +0 -41
47 lines not on this page · raw message
net/netfilter/nft_chain_filter.c +7 -22
@@ -322,37 +322,22 @@ static void nft_netdev_event(unsigned long event, struct net_device *dev, struct nft_ctx *ctx) {struct nft_base_chain *basechain =nft_base_chain (ctx->chain); -struct nft_hook *hook, *found =NULL ; -int n =0 ; +struct nft_hook *hook;if (event !=NETDEV_UNREGISTER )return ;list_for_each_entry (hook, &basechain->hook_list, list) { -if (hook->ops.dev == dev) - found = hook; - - n++; - } -if (!found) -return ; +if (hook->ops.dev != dev) +continue ; -if (n >1 ) {if (!(ctx->chain->table->flags &NFT_TABLE_F_DORMANT )) -nf_unregister_net_hook (ctx->net, &found->ops); +nf_unregister_net_hook (ctx->net, &hook->ops); -list_del_rcu (&found->list); -kfree_rcu (found, rcu); -return ; +list_del_rcu (&hook->list); +kfree_rcu (hook, rcu); +break ; } - -/* UNREGISTER events are also happening on netns exit. -* -* Although nf_tables core releases all tables/chains, only this event -* handler provides guarantee that hook->ops.dev is still accessible, -* so we cannot skip exiting net namespaces. -*/ -__nft_release_basechain (ctx); } static int nf_tables_netdev_event(struct notifier_block *this,
Signature · 1 line
2.53.0
Re: [PATCH 6.6 6.1 1/2] netfilter: nf_tables: Tolerate chains with no remaining hooks
Quoted 4 lines
commit
fc0133428e7ad65aa6b7c8e65ccfe86e469e4512upstream.Do not drop a netdev-family chain if the last interface it is registered for vanishes.
Queued the 6.12 and 6.6 series, thanks.
I'm not taking this for 6.1 though. It leaves a netdev chain with no devices behind, and 6.1 can't handle that state because it lacks
207296f1a03b ("netfilter: nf_tables: allow to create netdev chain without device") b9703ed44ffb ("netfilter: nf_tables: support for adding new devices to an existing netdev chain")
On 6.1 a non-flushing "nft -f" that re-adds the chain once the device is back fails with EEXIST, and a ruleset dump that contains the orphaned chain can't be restored.
For 6.1, could you either do a minimal fix for the nf_tables_netdev_event() walker that Pablo or Florian are happy with, or get their OK to carry this behaviour change there?
Signature · 2 lines
Thanks, Sasha
PATCH 1/1 netfilter: nf_tables: fix UAF in nf_tables_netdev_event walker
This is a 6.1-only fix. Mainline already fixed this bug in fc0133428e7a ("netfilter: nf_tables: Tolerate chains with no remaining hooks"), which 6.1 cannot take because it lacks 207296f1a03b ("netfilter: nf_tables:
allow to create netdev chain without device") and b9703ed44ffb ("netfilter: nf_tables: support for adding new devices to an existing netdev chain"). So 6.1 keeps dropping the chain on the last NETDEV_UNREGISTER, and this patch only makes the walker safe.
nf_tables_netdev_event() walks table->chains with list_for_each_entry_safe(). On the last NETDEV_UNREGISTER for a base chain, nft_netdev_event() calls __nft_release_basechain(), which removes that base chain (nft_chain_del()) and destroys its rules. A JUMP/GOTO rule targeting an NFT_CHAIN_BINDING chain deactivates and frees that successor (nft_immediate_destroy() -> nf_tables_chain_destroy()), so the walker's saved "nr" iterator can point at freed memory, triggering a slab-use-after-free.
Fix it by restarting the table->chains walk whenever nft_netdev_event() released a chain. __nft_release_basechain() removes the base chain from the list before returning, so a restart cannot revisit the freed chain and the walk terminates.
--- net/netfilter/nft_chain_filter.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
net/netfilter/nft_chain_filter.c +9 -5
@@ -318,7 +318,7 @@ static const struct nft_chain_type nft_chain_filter_netdev = { }, }; -static void nft_netdev_event (unsigned long event,struct net_device *dev, +static bool nft_netdev_event (unsigned long event,struct net_device *dev,struct nft_ctx *ctx) {struct nft_base_chain *basechain =nft_base_chain (ctx->chain);
@@ -326,7 +326,7 @@ static void nft_netdev_event(unsigned long event, struct net_device *dev,int n =0 ;if (event !=NETDEV_UNREGISTER ) -return ; +return false;list_for_each_entry (hook, &basechain->hook_list, list) {if (hook->ops.dev == dev)
@@ -335,7 +335,7 @@ static void nft_netdev_event(unsigned long event, struct net_device *dev, n++; }if (!found) -return ; +return false;if (n >1 ) {if (!(ctx->chain->table->flags &NFT_TABLE_F_DORMANT ))
@@ -343,7 +343,7 @@ static void nft_netdev_event(unsigned long event, struct net_device *dev,list_del_rcu (&found->list);kfree_rcu (found, rcu); -return ; +return false; }/* UNREGISTER events are also happening on netns exit.
@@ -353,6 +353,8 @@ static void nft_netdev_event(unsigned long event, struct net_device *dev,* so we cannot skip exiting net namespaces. */ __nft_release_basechain (ctx); + +return true; } static int nf_tables_netdev_event(struct notifier_block *this,
@@ -380,6 +382,7 @@ static int nf_tables_netdev_event(struct notifier_block *this, ctx.family = table->family; ctx.table = table; +restart:list_for_each_entry_safe (chain, nr, &table->chains, list) {if (!nft_is_base_chain (chain))continue ;
@@ -390,7 +393,8 @@ static int nf_tables_netdev_event(struct notifier_block *this,continue ; ctx.chain = chain; -nft_netdev_event (event, dev, &ctx); +if (nft_netdev_event (event, dev, &ctx)) + goto restart; } }mutex_unlock (&nft_net->commit_mutex);
Signature · 1 line
2.49.0.windows.1
Pablo Neira Ayuso
maintainerRe: [PATCH 6.1] netfilter: nf_tables: fix UAF in nf_tables_netdev_event walker
Quoted 6 lines · Ma Xinmeng
This is a 6.1-only fix. Mainline already fixed this bug in
fc0133428e7a("netfilter:nf_tables: Tolerate chains with no remaining hooks"), which 6.1 cannot take because it lacks207296f1a03b("netfilter:nf_tables:
allow to create netdev chain without device") andb9703ed44ffb("netfilter:nf_tables: support for adding new devices to an existing netdev chain").
Then, why not add those patches you refer to as -stable dependencies? -stable trees will become hard to maintain if they start deviating too much from upstream.
Quoted 92 lines
So 6.1 keeps dropping the chain on the last
NETDEV_UNREGISTER, and this patch only makes the walker safe.
nf_tables_netdev_event()walkstable->chainswithlist_for_each_entry_safe(). On the lastNETDEV_UNREGISTERfor a base chain,nft_netdev_event()calls__nft_release_basechain(), which removes that base chain (nft_chain_del()) and destroys its rules. A JUMP/GOTO rule targeting anNFT_CHAIN_BINDINGchain deactivates and frees that successor (nft_immediate_destroy()->nf_tables_chain_destroy()), so the walker's saved "nr" iterator can point at freed memory, triggering a slab-use-after-free.Fix it by restarting the
table->chainswalk whenevernft_netdev_event()released a chain.__nft_release_basechain()removes the base chain from the list before returning, so a restart cannot revisit the freed chain and the walk terminates.Signed-off-by Ma Xinmeng <[email protected]>--- net/netfilter/nft_chain_filter.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)net/netfilter/nft_chain_filter.c +9
-5@@ -318,7 +318,7 @@ static const struct nft_chain_type nft_chain_filter_netdev = { }, }; -static void nft_netdev_event (unsigned long event,struct net_device *dev, +static bool nft_netdev_event (unsigned long event,struct net_device *dev,struct nft_ctx *ctx) {struct nft_base_chain *basechain =nft_base_chain (ctx->chain);@@ -326,7 +326,7 @@ static void nft_netdev_event(unsigned long event, struct net_device *dev,int n =0 ;if (event !=NETDEV_UNREGISTER ) -return ; +return false;list_for_each_entry (hook, &basechain->hook_list, list) {if (hook->ops.dev == dev)@@ -335,7 +335,7 @@ static void nft_netdev_event(unsigned long event, struct net_device *dev, n++; }if (!found) -return ; +return false;if (n >1 ) {if (!(ctx->chain->table->flags &NFT_TABLE_F_DORMANT ))@@ -343,7 +343,7 @@ static void nft_netdev_event(unsigned long event, struct net_device *dev,list_del_rcu (&found->list);kfree_rcu (found, rcu); -return ; +return false; }/* UNREGISTER events are also happening on netns exit. @@ -353,6 +353,8 @@ static void nft_netdev_event(unsigned long event, struct net_device *dev,* so we cannot skip exiting net namespaces. */ __nft_release_basechain (ctx); + +return true; } static int nf_tables_netdev_event(struct notifier_block *this,@@ -380,6 +382,7 @@ static int nf_tables_netdev_event(struct notifier_block *this, ctx.family = table->family; ctx.table = table; +restart:list_for_each_entry_safe (chain, nr, &table->chains, list) {if (!nft_is_base_chain (chain))continue ;@@ -390,7 +393,8 @@ static int nf_tables_netdev_event(struct notifier_block *this,continue ; ctx.chain = chain; -nft_netdev_event (event, dev, &ctx); +if (nft_netdev_event (event, dev, &ctx)) + goto restart; } }mutex_unlock (&nft_net->commit_mutex);Signature · 1 line
2.49.0.windows.1
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 2/2 netfilter: nf_tables: support for adding new devices to an existing netdev chain
From: Pablo Neira Ayuso <[email protected]>
This patch allows users to add devices to an existing netdev chain.
This is a 6.1 backport of upstream commit b9703ed44ffb, adapted to 6.1's nft_chain_parse_hook() and nf_tables_chain_destroy() signatures.
--- include/net/netfilter/nf_tables.h | 6 + net/netfilter/nf_tables_api.c | 213 +++++++++++++++++++----------- 2 files changed, 140 insertions(+), 79 deletions(-)
include/net/netfilter/nf_tables.h +6 -0
@@ -1625,6 +1625,8 @@ struct nft_trans_chain {u8 policy;bool bound;u32 chain_id; +struct nft_base_chain *basechain; +struct list_head hook_list; };#define nft_trans_chain (trans) \
@@ -1641,6 +1643,10 @@ struct nft_trans_chain { (((struct nft_trans_chain *)trans->data)->bound)#define nft_trans_chain_id (trans) \ (((struct nft_trans_chain *)trans->data)->chain_id) +#define nft_trans_basechain (trans) \ + (((struct nft_trans_chain *)trans->data)->basechain) +#define nft_trans_chain_hooks (trans) \ + (((struct nft_trans_chain *)trans->data)->hook_list)struct nft_trans_table {bool update;
net/netfilter/nf_tables_api.c +134 -79
405 lines not on this page · raw message
Signature · 1 line
2.43.0
PATCH 1/2 netfilter: nf_tables: allow to create netdev chain without device
In reply to Pablo Neira AyusoFrom: Pablo Neira Ayuso <[email protected]>
Relax netdev chain creation to allow for loading the ruleset, then adding/deleting devices at a later stage. Hardware offload does not support for this feature yet.
This is a 6.1 backport of upstream commit 207296f1a03b; the hunk for nft_delchain_hook() is dropped since that function is not present in 6.1.
--- net/netfilter/nf_tables_api.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)
net/netfilter/nf_tables_api.c +11 -9
@@ -2180,7 +2180,7 @@ struct nft_chain_hook {static int nft_chain_parse_netdev (struct net *net,struct nlattr *tb[], -struct list_head *hook_list) +struct list_head *hook_list,u32 flags) {struct nft_hook *hook;int err;
@@ -2197,19 +2197,20 @@ static int nft_chain_parse_netdev(struct net *net,if (err <0 )return err; -if (list_empty (hook_list)) -return -EINVAL ; - }else { -return -EINVAL ; } +if (flags &NFT_CHAIN_HW_OFFLOAD && +list_empty (hook_list)) +return -EINVAL ; +return 0 ; }static int nft_chain_parse_hook (struct net *net,const struct nlattr *const nla[],struct nft_chain_hook *hook,u8 family, -struct netlink_ext_ack *extack,bool autoload) +struct netlink_ext_ack *extack,bool autoload, +u32 flags) {struct nftables_pernet *nft_net =nft_pernet (net);struct nlattr *ha[NFTA_HOOK_MAX +1 ];
@@ -2261,7 +2262,7 @@ static int nft_chain_parse_hook(struct net *net,INIT_LIST_HEAD (&hook->list);if (nft_base_chain_netdev (family, hook->num)) { - err =nft_chain_parse_netdev (net, ha, &hook->list); + err =nft_chain_parse_netdev (net, ha, &hook->list, flags);if (err <0 ) {module_put (type->owner);return err;
@@ -2409,7 +2410,7 @@ static int nf_tables_addchain(struct nft_ctx *ctx, u8 family, u8 genmask,return -EOPNOTSUPP ; err =nft_chain_parse_hook (net, nla, &hook, family, extack, - true); + true, flags);if (err <0 )return err;
@@ -2574,7 +2575,7 @@ static int nf_tables_updchain(struct nft_ctx *ctx, u8 genmask, u8 policy,return -EEXIST ; } err =nft_chain_parse_hook (ctx->net, nla, &hook, ctx->family, - extack, false); + extack, false, flags);if (err <0 )return err;
@@ -2795,6 +2796,7 @@ static int nf_tables_newchain(struct sk_buff *skb, const struct nfnl_info *info,return nf_tables_addchain (&ctx, family, genmask, policy, flags, extack); } +static int nf_tables_delchain (struct sk_buff *skb,const struct nfnl_info *info,const struct nlattr *const nla[]) {
Signature · 1 line
2.43.0
Sasha Levin
maintainerRe: [PATCH 6.1 1/2] netfilter: nf_tables: allow to create netdev chain without device
Quoted 2 lines
This is a 6.1 backport of upstream commit
207296f1a03b; the hunk fornft_delchain_hook()is dropped since that function is not present in 6.1.
This series only brings in the prerequisites. The UAF fix itself isn't in it:
fc0133428e7a ("netfilter: nf_tables: Tolerate chains with no remaining hooks") 375f222800bc ("netfilter: nf_tables: Simplify chain netdev notifier")
2/2 also adds b9703ed44ffb ("netfilter: nf_tables: support for adding new devices to an existing netdev chain") to 6.1 without the later fixes for it, none of which 6.1 has:
043d2acf5722 ("netfilter: nf_tables: drop module reference after updating chain") 7eaf837a4eb5 ("netfilter: nf_tables: Fix a memory leak in nf_tables_updchain") 1e1fb6f00f52 ("netfilter: nf_tables: reject table flag and netdev basechain updates") 216e7bf7402c ("netfilter: nf_tables: skip netdev hook unregistration if table is dormant") 688c15017d5c ("netfilter: nf_tables: don't unregister hook when table is dormant") 4ffcf5ca81c3 ("netfilter: nf_tables: use rcu chain hook list iterator from netlink dump path")
It also needs the netdev chain parts of a6134e62dba2 ("netfilter:nf_tables: join hook list via splice_list_rcu() in commit phase") and cf5fb87fcdaa ("netfilter: nf_tables: reject duplicate device on updates"); 6.1 only has their flowtable parts. Without 043d2acf5722, every base chain update that carries a hook leaks a reference on the chain type module.
Could you send a single 6.1 series in upstream order: the two prerequisites, the fixes above, then fc0133428e7a and 375f222800bc? Please start each patch with its "commit <sha> upstream." line and add a cover letter. An ack from Pablo or Florian would help too.
5.15 and 5.10 have the same UAF. Are you planning to cover them as well?
Signature · 2 lines
Thanks, Sasha
Pablo Neira Ayuso
maintainerRe: [PATCH 6.1 1/2] netfilter: nf_tables: allow to create netdev chain without device
Hi,
Quoted 27 lines · Sasha Levin
Quoted 2 lines
This is a 6.1 backport of upstream commit
207296f1a03b; the hunk fornft_delchain_hook()is dropped since that function is not present in 6.1.This series only brings in the prerequisites. The UAF fix itself isn't in it:
fc0133428e7a("netfilter:nf_tables: Tolerate chains with no remaining hooks")375f222800bc("netfilter:nf_tables: Simplify chain netdev notifier")2/2 also adds
b9703ed44ffb("netfilter:nf_tables: support for adding new devices to an existing netdev chain") to 6.1 without the later fixes for it, none of which 6.1 has:
043d2acf5722("netfilter:nf_tables: drop module reference after updating chain")7eaf837a4eb5("netfilter:nf_tables: Fix a memory leak innf_tables_updchain")1e1fb6f00f52("netfilter:nf_tables: reject table flag and netdev basechain updates")216e7bf7402c("netfilter:nf_tables: skip netdev hook unregistration if table is dormant")688c15017d5c("netfilter:nf_tables: don't unregister hook when table is dormant")4ffcf5ca81c3("netfilter:nf_tables: use rcu chain hook list iterator from netlink dump path")It also needs the netdev chain parts of
a6134e62dba2("netfilter:nf_tables: join hook list viasplice_list_rcu()in commit phase") andcf5fb87fcdaa("netfilter:nf_tables: reject duplicate device on updates"); 6.1 only has their flowtable parts. Without043d2acf5722, every base chain update that carries a hook leaks a reference on the chain type module.
Quoted 6 lines
Could you send a single 6.1 series in upstream order: the two prerequisites, the fixes above, then
fc0133428e7aand375f222800bc? Please start each patch with its "commit <sha> upstream." line and add a cover letter. An ack from Pablo or Florian would help too.5.15 and 5.10 have the same UAF. Are you planning to cover them as well?
Yes, I am collecting backport patches and preparing a batch for you.
PATCH 2/2 netfilter: nf_tables: Simplify chain netdev notifier
In reply to Yu JunzheFrom: Phil Sutter <[email protected]>
commit 375f222800bc001bb9cbd2baa1daec006430aeba upstream.
With conditional chain deletion gone, callback code simplifies: Instead of filling an nft_ctx object, just pass basechain to the per-chain function. Also plain list_for_each_entry() is safe now.
--- net/netfilter/nft_chain_filter.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-)
net/netfilter/nft_chain_filter.c +7 -14
@@ -319,17 +319,16 @@ static const struct nft_chain_type nft_chain_filter_netdev = { };static void nft_netdev_event (unsigned long event,struct net_device *dev, -struct nft_ctx *ctx) +struct nft_base_chain *basechain) { -struct nft_base_chain *basechain =nft_base_chain (ctx->chain);struct nft_hook *hook;list_for_each_entry (hook, &basechain->hook_list, list) {if (hook->ops.dev != dev)continue ; -if (!(ctx->chain->table->flags &NFT_TABLE_F_DORMANT )) -nf_unregister_net_hook (ctx->net, &hook->ops); +if (!(basechain->chain.table->flags &NFT_TABLE_F_DORMANT )) +nf_unregister_net_hook (dev_net (dev), &hook->ops);list_del_rcu (&hook->list);kfree_rcu (hook, rcu);
@@ -343,25 +342,20 @@ static int nf_tables_netdev_event(struct notifier_block *this,struct net_device *dev =netdev_notifier_info_to_dev (ptr);struct nft_base_chain *basechain;struct nftables_pernet *nft_net; -struct nft_chain *chain, *nr; +struct nft_chain *chain;struct nft_table *table; -struct nft_ctx ctx = { - .net =dev_net (dev), - };if (event !=NETDEV_UNREGISTER )return NOTIFY_DONE ; - nft_net =nft_pernet (ctx.net); + nft_net =nft_pernet (dev_net (dev));mutex_lock (&nft_net->commit_mutex);list_for_each_entry (table, &nft_net->tables, list) {if (table->family !=NFPROTO_NETDEV && table->family !=NFPROTO_INET )continue ; - ctx.family = table->family; - ctx.table = table; -list_for_each_entry_safe (chain, nr, &table->chains, list) { +list_for_each_entry (chain, &table->chains, list) {if (!nft_is_base_chain (chain))continue ;
@@ -370,8 +364,7 @@ static int nf_tables_netdev_event(struct notifier_block *this, basechain->ops.hooknum != NF_INET_INGRESS)continue ; - ctx.chain = chain; -nft_netdev_event (event, dev, &ctx); +nft_netdev_event (event, dev, basechain); } }mutex_unlock (&nft_net->commit_mutex);
Signature · 1 line
2.53.0
PATCH 2/2 netfilter: nf_tables: Simplify chain netdev notifier
In reply to Yu JunzheFrom: Phil Sutter <[email protected]>
commit 375f222800bc001bb9cbd2baa1daec006430aeba upstream.
With conditional chain deletion gone, callback code simplifies: Instead of filling an nft_ctx object, just pass basechain to the per-chain function. Also plain list_for_each_entry() is safe now.
--- net/netfilter/nft_chain_filter.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-)
net/netfilter/nft_chain_filter.c +7 -14
@@ -319,9 +319,8 @@ static const struct nft_chain_type nft_chain_filter_netdev = { };static void nft_netdev_event (unsigned long event,struct net_device *dev, -struct nft_ctx *ctx) +struct nft_base_chain *basechain) { -struct nft_base_chain *basechain =nft_base_chain (ctx->chain);struct nft_hook *hook;if (event !=NETDEV_UNREGISTER )
@@ -331,8 +330,8 @@ static void nft_netdev_event(unsigned long event, struct net_device *dev,if (hook->ops.dev != dev)continue ; -if (!(ctx->chain->table->flags &NFT_TABLE_F_DORMANT )) -nf_unregister_net_hook (ctx->net, &hook->ops); +if (!(basechain->chain.table->flags &NFT_TABLE_F_DORMANT )) +nf_unregister_net_hook (dev_net (dev), &hook->ops);list_del_rcu (&hook->list);kfree_rcu (hook, rcu);
@@ -346,26 +345,21 @@ static int nf_tables_netdev_event(struct notifier_block *this,struct net_device *dev =netdev_notifier_info_to_dev (ptr);struct nft_base_chain *basechain;struct nftables_pernet *nft_net; -struct nft_chain *chain, *nr; +struct nft_chain *chain;struct nft_table *table; -struct nft_ctx ctx = { - .net =dev_net (dev), - };if (event !=NETDEV_UNREGISTER && event !=NETDEV_CHANGENAME )return NOTIFY_DONE ; - nft_net =nft_pernet (ctx.net); + nft_net =nft_pernet (dev_net (dev));mutex_lock (&nft_net->commit_mutex);list_for_each_entry (table, &nft_net->tables, list) {if (table->family !=NFPROTO_NETDEV && table->family !=NFPROTO_INET )continue ; - ctx.family = table->family; - ctx.table = table; -list_for_each_entry_safe (chain, nr, &table->chains, list) { +list_for_each_entry (chain, &table->chains, list) {if (!nft_is_base_chain (chain))continue ;
@@ -374,8 +368,7 @@ static int nf_tables_netdev_event(struct notifier_block *this, basechain->ops.hooknum != NF_INET_INGRESS)continue ; - ctx.chain = chain; -nft_netdev_event (event, dev, &ctx); +nft_netdev_event (event, dev, basechain); } }mutex_unlock (&nft_net->commit_mutex);
Signature · 1 line
2.53.0