Netfilter fixes for net
Subsystems (3)
Pablo Neira Ayuso
maintainercover Netfilter fixes for net
Hi,
The following contain more Netfilter fixes for net:
1) syzbot warning in nfnetlink bind, from Florian.
2) Refetch conntrack after __nf_conntrack_confirm(), from Florian Westphal.
3) Move struct nf_ct_timeout back at the bottom of the ctnl_time, to where it before recent update, also from Florian.
4) Add NL_SET_BAD_ATTR() to nf_tables netlink for proper set element commands error reporting.
Please, pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git
Thanks.
----------------------------------------------------------------
The following changes since commit 02ded5a173619b11728b8bf75a3fd995a2c1ff28:
net: dsa: mv88e6xxx: Fix refcount leak in mv88e6xxx_mdios_register (2022-05-27 08:02:33 +0100)
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 b53c116642502b0c85ecef78bff4f826a7dd4145:
netfilter: nf_tables: set element extended ACK reporting support (2022-05-27 11:16:38 +0200)
----------------------------------------------------------------
Florian Westphal (3):
netfilter: nfnetlink: fix warn in nfnetlink_unbind
netfilter: conntrack: re-fetch conntrack after insertion
netfilter: cttimeout: fix slab-out-of-bounds read in cttimeout_net_exit
Pablo Neira Ayuso (1):
netfilter: nf_tables: set element extended ACK reporting support
include/net/netfilter/nf_conntrack_core.h | 7 ++++++- net/netfilter/nf_tables_api.c | 12 +++++++++--- net/netfilter/nfnetlink.c | 24 +++++------------------- net/netfilter/nfnetlink_cttimeout.c | 5 +++-- 4 files changed, 23 insertions(+), 25 deletions(-)
Pablo Neira Ayuso
maintainerPATCH 1/4 netfilter: nfnetlink: fix warn in nfnetlink_unbind
From: Florian Westphal <[email protected]>
syzbot reports following warn:
WARNING: CPU: 0 PID: 3600 at net/netfilter/nfnetlink.c:703 nfnetlink_unbind+0x357/0x3b0 net/netfilter/nfnetlink.c:694
The syzbot generated program does this:
socket(AF_NETLINK, SOCK_RAW, NETLINK_NETFILTER) = 3 setsockopt(3, SOL_NETLINK, NETLINK_DROP_MEMBERSHIP, [1], 4) = 0
... which triggers 'WARN_ON_ONCE(nfnlnet->ctnetlink_listeners == 0)' check.
Instead of counting, just enable reporting for every bind request and check if we still have listeners on unbind.
While at it, also add the needed bounds check on nfnl_group2type[] access.
--- net/netfilter/nfnetlink.c | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-)
net/netfilter/nfnetlink.c +5 -19
@@ -45,7 +45,6 @@ MODULE_DESCRIPTION("Netfilter messages via netlink socket");static unsigned int nfnetlink_pernet_id__read_mostly ;struct nfnl_net { -unsigned int ctnetlink_listeners;struct sock *nfnl; };
@@ -673,18 +672,8 @@ static int nfnetlink_bind(struct net *net, int group)#ifdef CONFIG_NF_CONNTRACK_EVENTS if (type ==NFNL_SUBSYS_CTNETLINK ) { -struct nfnl_net *nfnlnet =nfnl_pernet (net); -nfnl_lock (NFNL_SUBSYS_CTNETLINK ); - -if (WARN_ON_ONCE (nfnlnet->ctnetlink_listeners ==UINT_MAX )) { -nfnl_unlock (NFNL_SUBSYS_CTNETLINK ); -return -EOVERFLOW ; - } - - nfnlnet->ctnetlink_listeners++; -if (nfnlnet->ctnetlink_listeners ==1 ) -WRITE_ONCE (net->ct.ctnetlink_has_listener, true); +WRITE_ONCE (net->ct.ctnetlink_has_listener, true);nfnl_unlock (NFNL_SUBSYS_CTNETLINK ); }#endif
@@ -694,15 +683,12 @@ static int nfnetlink_bind(struct net *net, int group)static void nfnetlink_unbind (struct net *net,int group) {#ifdef CONFIG_NF_CONNTRACK_EVENTS -int type = nfnl_group2type[group]; - -if (type ==NFNL_SUBSYS_CTNETLINK ) { -struct nfnl_net *nfnlnet =nfnl_pernet (net); +if (group <=NFNLGRP_NONE || group >NFNLGRP_MAX ) +return ; +if (nfnl_group2type[group] ==NFNL_SUBSYS_CTNETLINK ) {nfnl_lock (NFNL_SUBSYS_CTNETLINK ); -WARN_ON_ONCE (nfnlnet->ctnetlink_listeners ==0 ); - nfnlnet->ctnetlink_listeners--; -if (nfnlnet->ctnetlink_listeners ==0 ) +if (!nfnetlink_has_listeners (net, group))WRITE_ONCE (net->ct.ctnetlink_has_listener, false);nfnl_unlock (NFNL_SUBSYS_CTNETLINK ); }
Signature · 1 line
2.30.2
Re: [PATCH net 1/4] netfilter: nfnetlink: fix warn in nfnetlink_unbind
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 8 lines · On Fri, 27 May 2022 11:20:20 +0200 you wrote:
From: Florian Westphal <[email protected]>
syzbot reports following warn:
WARNING: CPU: 0 PID: 3600 at net/netfilter/nfnetlink.c:703 nfnetlink_unbind+0x357/0x3b0 net/netfilter/nfnetlink.c:694The syzbot generated program does this:
[...]
Here is the summary with links:
- [net,1/4] netfilter: nfnetlink: fix warn in nfnetlink_unbind
https://git.kernel.org/netdev/net/c/ffd219efd9ee - [net,2/4] netfilter: conntrack: re-fetch conntrack after insertion https://git.kernel.org/netdev/net/c/56b14ecec97f - [net,3/4] netfilter: cttimeout: fix slab-out-of-bounds read in cttimeout_net_exit https://git.kernel.org/netdev/net/c/aeed55a08d0b - [net,4/4] netfilter: nf_tables: set element extended ACK reporting support https://git.kernel.org/netdev/net/c/b53c11664250
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: conntrack: re-fetch conntrack after insertion
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
In case the conntrack is clashing, insertion can free skb->_nfct and set skb->_nfct to the already-confirmed entry.
This wasn't found before because the conntrack entry and the extension space used to free'd after an rcu grace period, plus the race needs events enabled to trigger.
--- include/net/netfilter/nf_conntrack_core.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
include/net/netfilter/nf_conntrack_core.h +6 -1
@@ -58,8 +58,13 @@ static inline int nf_conntrack_confirm(struct sk_buff *skb)int ret =NF_ACCEPT ;if (ct) { -if (!nf_ct_is_confirmed (ct)) +if (!nf_ct_is_confirmed (ct)) { ret =__nf_conntrack_confirm (skb); + +if (ret ==NF_ACCEPT ) + ct = (struct nf_conn *)skb_nfct (skb); + } +if (ret ==NF_ACCEPT &&nf_ct_ecache_exist (ct))nf_ct_deliver_cached_events (ct); }
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 3/4 netfilter: cttimeout: fix slab-out-of-bounds read in cttimeout_net_exit
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
syzbot reports:
BUG: KASAN: slab-out-of-bounds in __list_del_entry_valid+0xcc/0xf0 lib/list_debug.c:42 [..] list_del include/linux/list.h:148 [inline] cttimeout_net_exit+0x211/0x540 net/netfilter/nfnetlink_cttimeout.c:617
No reproducer so far. Looking at recent changes in this area its clear that the free_head must not be at the end of the structure because nf_ct_timeout structure has variable size.
--- net/netfilter/nfnetlink_cttimeout.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/netfilter/nfnetlink_cttimeout.c +3 -2
@@ -35,12 +35,13 @@ static unsigned int nfct_timeout_id __read_mostly;struct ctnl_timeout {struct list_head head; +struct list_head free_head;struct rcu_head rcu_head;refcount_t refcnt;char name[CTNL_TIMEOUT_NAME_MAX ]; -struct nf_ct_timeout timeout; -struct list_head free_head; +/* must be at the end */ +struct nf_ct_timeout timeout; };struct nfct_timeout_pernet {
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 4/4 netfilter: nf_tables: set element extended ACK reporting support
In reply to Pablo Neira AyusoReport the element that causes problems via netlink extended ACK for set element commands.
--- net/netfilter/nf_tables_api.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
net/netfilter/nf_tables_api.c +9 -3
@@ -5348,8 +5348,10 @@ static int nf_tables_getsetelem(struct sk_buff *skb,nla_for_each_nested (attr, nla[NFTA_SET_ELEM_LIST_ELEMENTS ], rem) { err =nft_get_set_elem (&ctx, set, attr); -if (err <0 ) +if (err <0 ) { +NL_SET_BAD_ATTR (extack, attr);break ; + } }return err;
@@ -6126,8 +6128,10 @@ static int nf_tables_newsetelem(struct sk_buff *skb,nla_for_each_nested (attr, nla[NFTA_SET_ELEM_LIST_ELEMENTS ], rem) { err =nft_add_set_elem (&ctx, set, attr, info->nlh->nlmsg_flags); -if (err <0 ) +if (err <0 ) { +NL_SET_BAD_ATTR (extack, attr);return err; + } }if (nft_net->validate_state ==NFT_VALIDATE_DO )
@@ -6397,8 +6401,10 @@ static int nf_tables_delsetelem(struct sk_buff *skb,nla_for_each_nested (attr, nla[NFTA_SET_ELEM_LIST_ELEMENTS ], rem) { err =nft_del_setelem (&ctx, set, attr); -if (err <0 ) +if (err <0 ) { +NL_SET_BAD_ATTR (extack, attr);break ; + } }return err; }
Signature · 1 line
2.30.2