stable fixes for 5.4
Subsystems (2)
Pablo Neira Ayuso
maintainercover stable fixes for 5.4
Hi Greg, Sasha,
The following list shows the backported patches, I am using original commit IDs for reference:
1) 1e9451cbda45 ("netfilter: nf_tables: fix nat hook table deletion")
2) 802b805162a1 ("netfilter: nftables: add helper function to set the base sequence number")
3) 19c28b1374fb ("netfilter: add helper function to set up the nfnetlink header and use it")
4) 0854db2aaef3 ("netfilter: nf_tables: use net_generic infra for transaction data")
5) 81ea01066741 ("netfilter: nf_tables: add rescheduling points during loop detection walks")
6) 1240eb93f061 ("netfilter: nf_tables: incorrect error path handling with NFT_MSG_NEWRULE")
7) 26b5a5712eb8 ("netfilter: nf_tables: add NFT_TRANS_PREPARE_ERROR to deal with bound set/chain")
8) 938154b93be8 ("netfilter: nf_tables: reject unbound anonymous set before commit phase")
9) 3e70489721b6 ("netfilter: nf_tables: unbind non-anonymous set if rule construction fails")
10) 2024439bd5ce ("netfilter: nf_tables: fix scheduling-while-atomic splat")
Please, apply,
Thanks
Florian Westphal (4):
netfilter: nf_tables: fix nat hook table deletion
netfilter: nf_tables: use net_generic infra for transaction data
netfilter: nf_tables: add rescheduling points during loop detection walks
netfilter: nf_tables: fix scheduling-while-atomic splat
Pablo Neira Ayuso (6):
netfilter: nftables: add helper function to set the base sequence number
netfilter: add helper function to set up the nfnetlink header and use it
netfilter: nf_tables: incorrect error path handling with NFT_MSG_NEWRULE
netfilter: nf_tables: add NFT_TRANS_PREPARE_ERROR to deal with bound set/chain
netfilter: nf_tables: reject unbound anonymous set before commit phase
netfilter: nf_tables: unbind non-anonymous set if rule construction fails
include/linux/netfilter/nfnetlink.h | 27 ++ include/net/netfilter/nf_tables.h | 14 + include/net/netns/nftables.h | 6 - net/netfilter/ipset/ip_set_core.c | 17 +- net/netfilter/nf_conntrack_netlink.c | 77 ++-- net/netfilter/nf_tables_api.c | 510 ++++++++++++++++----------- net/netfilter/nf_tables_offload.c | 29 +- net/netfilter/nf_tables_trace.c | 9 +- net/netfilter/nfnetlink_acct.c | 11 +- net/netfilter/nfnetlink_cthelper.c | 11 +- net/netfilter/nfnetlink_cttimeout.c | 22 +- net/netfilter/nfnetlink_log.c | 11 +- net/netfilter/nfnetlink_queue.c | 12 +- net/netfilter/nft_chain_filter.c | 11 +- net/netfilter/nft_compat.c | 11 +- net/netfilter/nft_dynset.c | 6 +- 16 files changed, 418 insertions(+), 366 deletions(-)
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 1/10 netfilter: nf_tables: fix nat hook table deletion
From: Florian Westphal <[email protected]>
[ 1e9451cbda456a170518b2bfd643e2cb980880bf ]
sybot came up with following transaction:
add table ip syz0
add chain ip syz0 syz2 { type nat hook prerouting priority 0; policy accept; } add table ip syz0 { flags dormant; }
delete chain ip syz0 syz2
delete table ip syz0
which yields:
hook not found, pf 2 num 0
WARNING: CPU: 0 PID: 6775 at net/netfilter/core.c:413 __nf_unregister_net_hook+0x3e6/0x4a0 net/netfilter/core.c:413 [..] nft_unregister_basechain_hooks net/netfilter/nf_tables_api.c:206 [inline] nft_table_disable net/netfilter/nf_tables_api.c:835 [inline] nf_tables_table_disable net/netfilter/nf_tables_api.c:868 [inline] nf_tables_commit+0x32d3/0x4d70 net/netfilter/nf_tables_api.c:7550 nfnetlink_rcv_batch net/netfilter/nfnetlink.c:486 [inline] nfnetlink_rcv_skb_batch net/netfilter/nfnetlink.c:544 [inline] nfnetlink_rcv+0x14a5/0x1e50 net/netfilter/nfnetlink.c:562 netlink_unicast_kernel net/netlink/af_netlink.c:1303 [inline]
Problem is that when I added ability to override base hook registration to make nat basechains register with the nat core instead of netfilter core, I forgot to update nft_table_disable() to use that instead of the 'raw' hook register interface.
In syzbot transaction, the basechain is of 'nat' type. Its registered with the nat core. The switch to 'dormant mode' attempts to delete from netfilter core instead.
After updating nft_table_disable/enable to use the correct helper, nft_(un)register_basechain_hooks can be folded into the only remaining caller.
Because nft_trans_table_enable() won't do anything when the DORMANT flag is set, remove the flag first, then re-add it in case re-enablement fails, else this patch breaks sequence:
add table ip x { flags dormant; }
/* add base chains */
add table ip x
The last 'add' will remove the dormant flags, but won't have any other effect -- base chains are not registered.
Then, next 'set dormant flag' will create another 'hook not found' splat.
--- net/netfilter/nf_tables_api.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
net/netfilter/nf_tables_api.c +6 -5
@@ -770,7 +770,7 @@ static void nft_table_disable(struct net *net, struct nft_table *table, u32 cnt)if (cnt && i++ == cnt)break ; -nf_unregister_net_hook (net, &nft_base_chain (chain)->ops); +nf_tables_unregister_hook (net, table, chain); } }
@@ -785,7 +785,7 @@ static int nf_tables_table_enable(struct net *net, struct nft_table *table)if (!nft_is_base_chain (chain))continue ; - err =nf_register_net_hook (net, &nft_base_chain (chain)->ops); + err =nf_tables_register_hook (net, table, chain);if (err <0 ) goto err;
@@ -829,11 +829,12 @@ static int nf_tables_updtable(struct nft_ctx *ctx)nft_trans_table_enable (trans) = false; }else if (!(flags &NFT_TABLE_F_DORMANT ) && ctx->table->flags &NFT_TABLE_F_DORMANT ) { + ctx->table->flags &= ~NFT_TABLE_F_DORMANT ; ret =nf_tables_table_enable (ctx->net, ctx->table); -if (ret >=0 ) { - ctx->table->flags &= ~NFT_TABLE_F_DORMANT ; +if (ret >=0 )nft_trans_table_enable (trans) = true; - } +else + ctx->table->flags |=NFT_TABLE_F_DORMANT ; }if (ret <0 ) goto err;
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 2/10 netfilter: nftables: add helper function to set the base sequence number
In reply to Pablo Neira Ayuso[ 802b805162a1b7d8391c40ac8a878e9e63287aff ]
This patch adds a helper function to calculate the base sequence number field that is stored in the nfnetlink header. Use the helper function whenever possible.
--- net/netfilter/nf_tables_api.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-)
net/netfilter/nf_tables_api.c +14 -9
@@ -588,6 +588,11 @@ nf_tables_chain_type_lookup(struct net *net, const struct nlattr *nla,return ERR_PTR (-ENOENT ); } +static __be16 nft_base_seq (const struct net *net) +{ +return htons (net->nft.base_seq &0xffff ); +} +static const struct nla_policy nft_table_policy[NFTA_TABLE_MAX +1 ] = { [NFTA_TABLE_NAME ] = { .type =NLA_STRING , .len =NFT_TABLE_MAXNAMELEN -1 },
@@ -610,7 +615,7 @@ static int nf_tables_fill_table_info(struct sk_buff *skb, struct net *net, nfmsg =nlmsg_data (nlh); nfmsg->nfgen_family = family; nfmsg->version =NFNETLINK_V0 ; - nfmsg->res_id =htons (net->nft.base_seq &0xffff ); + nfmsg->res_id =nft_base_seq (net); if (nla_put_string(skb, NFTA_TABLE_NAME, table->name) || nla_put_be32(skb, NFTA_TABLE_FLAGS, htonl(table->flags)) ||
@@ -1274,7 +1279,7 @@ static int nf_tables_fill_chain_info(struct sk_buff *skb, struct net *net, nfmsg =nlmsg_data (nlh); nfmsg->nfgen_family = family; nfmsg->version =NFNETLINK_V0 ; - nfmsg->res_id =htons (net->nft.base_seq &0xffff ); + nfmsg->res_id =nft_base_seq (net);if (nla_put_string (skb,NFTA_CHAIN_TABLE , table->name)) goto nla_put_failure;
@@ -2366,7 +2371,7 @@ static int nf_tables_fill_rule_info(struct sk_buff *skb, struct net *net, nfmsg =nlmsg_data (nlh); nfmsg->nfgen_family = family; nfmsg->version =NFNETLINK_V0 ; - nfmsg->res_id =htons (net->nft.base_seq &0xffff ); + nfmsg->res_id =nft_base_seq (net);if (nla_put_string (skb,NFTA_RULE_TABLE , table->name)) goto nla_put_failure;
@@ -3325,7 +3330,7 @@ static int nf_tables_fill_set(struct sk_buff *skb, const struct nft_ctx *ctx, nfmsg =nlmsg_data (nlh); nfmsg->nfgen_family = ctx->family; nfmsg->version =NFNETLINK_V0 ; - nfmsg->res_id =htons (ctx->net->nft.base_seq &0xffff ); + nfmsg->res_id =nft_base_seq (ctx->net);if (nla_put_string (skb,NFTA_SET_TABLE , ctx->table->name)) goto nla_put_failure;
@@ -4180,7 +4185,7 @@ static int nf_tables_dump_set(struct sk_buff *skb, struct netlink_callback *cb) nfmsg =nlmsg_data (nlh); nfmsg->nfgen_family = table->family; nfmsg->version =NFNETLINK_V0 ; - nfmsg->res_id =htons (net->nft.base_seq &0xffff ); + nfmsg->res_id =nft_base_seq (net);if (nla_put_string (skb,NFTA_SET_ELEM_LIST_TABLE , table->name)) goto nla_put_failure;
@@ -4252,7 +4257,7 @@ static int nf_tables_fill_setelem_info(struct sk_buff *skb, nfmsg =nlmsg_data (nlh); nfmsg->nfgen_family = ctx->family; nfmsg->version =NFNETLINK_V0 ; - nfmsg->res_id =htons (ctx->net->nft.base_seq &0xffff ); + nfmsg->res_id =nft_base_seq (ctx->net);if (nla_put_string (skb,NFTA_SET_TABLE , ctx->table->name)) goto nla_put_failure;
@@ -5383,7 +5388,7 @@ static int nf_tables_fill_obj_info(struct sk_buff *skb, struct net *net, nfmsg =nlmsg_data (nlh); nfmsg->nfgen_family = family; nfmsg->version =NFNETLINK_V0 ; - nfmsg->res_id =htons (net->nft.base_seq &0xffff ); + nfmsg->res_id =nft_base_seq (net); if (nla_put_string(skb, NFTA_OBJ_TABLE, table->name) || nla_put_string(skb, NFTA_OBJ_NAME, obj->key.name) ||
@@ -6059,7 +6064,7 @@ static int nf_tables_fill_flowtable_info(struct sk_buff *skb, struct net *net, nfmsg =nlmsg_data (nlh); nfmsg->nfgen_family = family; nfmsg->version =NFNETLINK_V0 ; - nfmsg->res_id =htons (net->nft.base_seq &0xffff ); + nfmsg->res_id =nft_base_seq (net); if (nla_put_string(skb, NFTA_FLOWTABLE_TABLE, flowtable->table->name) || nla_put_string(skb, NFTA_FLOWTABLE_NAME, flowtable->name) ||
@@ -6297,7 +6302,7 @@ static int nf_tables_fill_gen_info(struct sk_buff *skb, struct net *net, nfmsg =nlmsg_data (nlh); nfmsg->nfgen_family =AF_UNSPEC ; nfmsg->version =NFNETLINK_V0 ; - nfmsg->res_id =htons (net->nft.base_seq &0xffff ); + nfmsg->res_id =nft_base_seq (net); if (nla_put_be32(skb, NFTA_GEN_ID, htonl(net->nft.base_seq)) || nla_put_be32(skb, NFTA_GEN_PROC_PID, htonl(task_pid_nr(current))) ||
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 3/10 netfilter: add helper function to set up the nfnetlink header and use it
In reply to Pablo Neira Ayuso[ 19c28b1374fb1073a9ec873a6c10bf5f16b10b9d ]
This patch adds a helper function to set up the netlink and nfnetlink headers. Update existing codebase to use it.
--- include/linux/netfilter/nfnetlink.h | 27 +++++++ net/netfilter/ipset/ip_set_core.c | 17 +---- net/netfilter/nf_conntrack_netlink.c | 77 ++++++-------------- net/netfilter/nf_tables_api.c | 102 +++++++-------------------- net/netfilter/nf_tables_trace.c | 9 +-- net/netfilter/nfnetlink_acct.c | 11 +-- net/netfilter/nfnetlink_cthelper.c | 11 +-- net/netfilter/nfnetlink_cttimeout.c | 22 ++---- net/netfilter/nfnetlink_log.c | 11 +-- net/netfilter/nfnetlink_queue.c | 12 ++-- net/netfilter/nft_compat.c | 11 +-- 11 files changed, 102 insertions(+), 208 deletions(-)
include/linux/netfilter/nfnetlink.h +27 -0
@@ -56,6 +56,33 @@ static inline u16 nfnl_msg_type(u8 subsys, u8 msg_type)return subsys <<8 | msg_type; } +static inline void nfnl_fill_hdr (struct nlmsghdr *nlh,u8 family,u8 version, +__be16 res_id) +{ +struct nfgenmsg *nfmsg; + + nfmsg =nlmsg_data (nlh); + nfmsg->nfgen_family = family; + nfmsg->version = version; + nfmsg->res_id = res_id; +} + +static inline struct nlmsghdr *nfnl_msg_put (struct sk_buff *skb,u32 portid, +u32 seq,int type,int flags, +u8 family,u8 version, +__be16 res_id) +{ +struct nlmsghdr *nlh; + + nlh =nlmsg_put (skb, portid, seq, type,sizeof (struct nfgenmsg ), flags); +if (!nlh) +return NULL ; + +nfnl_fill_hdr (nlh, family, version, res_id); + +return nlh; +} +void nfnl_lock (__u8 subsys_id);void nfnl_unlock (__u8 subsys_id);#ifdef CONFIG_PROVE_LOCKING
net/netfilter/ipset/ip_set_core.c +3 -14
@@ -811,20 +811,9 @@ static struct nlmsghdr * start_msg(struct sk_buff *skb, u32 portid, u32 seq, unsigned int flags, enum ipset_cmd cmd) { - struct nlmsghdr *nlh; -struct nfgenmsg *nfmsg; - - nlh =nlmsg_put (skb, portid, seq,nfnl_msg_type (NFNL_SUBSYS_IPSET , cmd), -sizeof (*nfmsg), flags); -if (!nlh) -return NULL ; - - nfmsg =nlmsg_data (nlh); - nfmsg->nfgen_family =NFPROTO_IPV4 ; - nfmsg->version =NFNETLINK_V0 ; - nfmsg->res_id =0 ; - -return nlh; + return nfnl_msg_put(skb, portid, seq, + nfnl_msg_type(NFNL_SUBSYS_IPSET ,cmd ), flags, + NFPROTO_IPV4, NFNETLINK_V0, 0); }/* Create a set */
net/netfilter/nf_conntrack_netlink.c +21 -56
164 lines not on this page · raw message
net/netfilter/nf_tables_api.c +27 -75
209 lines not on this page · raw message
net/netfilter/nf_tables_trace.c +2 -7
@@ -183,7 +183,6 @@ static bool nft_trace_have_verdict_chain(struct nft_traceinfo *info)void nft_trace_notify (struct nft_traceinfo *info) {const struct nft_pktinfo *pkt = info->pkt; -struct nfgenmsg *nfmsg;struct nlmsghdr *nlh;struct sk_buff *skb;unsigned int size;
@@ -219,15 +218,11 @@ void nft_trace_notify(struct nft_traceinfo *info)return ; event =nfnl_msg_type (NFNL_SUBSYS_NFTABLES ,NFT_MSG_TRACE ); - nlh =nlmsg_put (skb,0 ,0 , event,sizeof (struct nfgenmsg ),0 ); + nlh =nfnl_msg_put (skb,0 ,0 , event,0 , info->basechain->type->family, +NFNETLINK_V0 ,0 );if (!nlh) goto nla_put_failure; - nfmsg =nlmsg_data (nlh); - nfmsg->nfgen_family = info->basechain->type->family; - nfmsg->version =NFNETLINK_V0 ; - nfmsg->res_id =0 ; -if (nla_put_be32 (skb,NFTA_TRACE_NFPROTO ,htonl (nft_pf (pkt)))) goto nla_put_failure;
net/netfilter/nfnetlink_acct.c +3 -8
@@ -132,21 +132,16 @@ nfnl_acct_fill_info(struct sk_buff *skb, u32 portid, u32 seq, u32 type, int event, struct nf_acct *acct) { struct nlmsghdr *nlh; -struct nfgenmsg *nfmsg;unsigned int flags = portid ?NLM_F_MULTI :0 ;u64 pkts, bytes;u32 old_flags; event =nfnl_msg_type (NFNL_SUBSYS_ACCT , event); - nlh =nlmsg_put (skb, portid, seq, event,sizeof (*nfmsg), flags); -if (nlh ==NULL ) + nlh =nfnl_msg_put (skb, portid, seq, event, flags,AF_UNSPEC , +NFNETLINK_V0 ,0 ); +if (!nlh) goto nlmsg_failure; - nfmsg =nlmsg_data (nlh); - nfmsg->nfgen_family =AF_UNSPEC ; - nfmsg->version =NFNETLINK_V0 ; - nfmsg->res_id =0 ; -if (nla_put_string (skb,NFACCT_NAME , acct->name)) goto nla_put_failure;
net/netfilter/nfnetlink_cthelper.c +3 -8
@@ -530,20 +530,15 @@ nfnl_cthelper_fill_info(struct sk_buff *skb, u32 portid, u32 seq, u32 type, int event, struct nf_conntrack_helper *helper) { struct nlmsghdr *nlh; -struct nfgenmsg *nfmsg;unsigned int flags = portid ?NLM_F_MULTI :0 ;int status; event =nfnl_msg_type (NFNL_SUBSYS_CTHELPER , event); - nlh =nlmsg_put (skb, portid, seq, event,sizeof (*nfmsg), flags); -if (nlh ==NULL ) + nlh =nfnl_msg_put (skb, portid, seq, event, flags,AF_UNSPEC , +NFNETLINK_V0 ,0 ); +if (!nlh) goto nlmsg_failure; - nfmsg =nlmsg_data (nlh); - nfmsg->nfgen_family =AF_UNSPEC ; - nfmsg->version =NFNETLINK_V0 ; - nfmsg->res_id =0 ; -if (nla_put_string (skb,NFCTH_NAME , helper->name)) goto nla_put_failure;
net/netfilter/nfnetlink_cttimeout.c +6 -16
@@ -160,22 +160,17 @@ ctnl_timeout_fill_info(struct sk_buff *skb, u32 portid, u32 seq, u32 type, int event, struct ctnl_timeout *timeout) { struct nlmsghdr *nlh; -struct nfgenmsg *nfmsg;unsigned int flags = portid ?NLM_F_MULTI :0 ;const struct nf_conntrack_l4proto *l4proto = timeout->timeout.l4proto;struct nlattr *nest_parms;int ret; event =nfnl_msg_type (NFNL_SUBSYS_CTNETLINK_TIMEOUT , event); - nlh =nlmsg_put (skb, portid, seq, event,sizeof (*nfmsg), flags); -if (nlh ==NULL ) + nlh =nfnl_msg_put (skb, portid, seq, event, flags,AF_UNSPEC , +NFNETLINK_V0 ,0 ); +if (!nlh) goto nlmsg_failure; - nfmsg =nlmsg_data (nlh); - nfmsg->nfgen_family =AF_UNSPEC ; - nfmsg->version =NFNETLINK_V0 ; - nfmsg->res_id =0 ; - if (nla_put_string(skb, CTA_TIMEOUT_NAME, timeout->name) || nla_put_be16(skb, CTA_TIMEOUT_L3PROTO, htons(timeout->timeout.l3num)) ||
@@ -382,21 +377,16 @@ cttimeout_default_fill_info(struct net *net, struct sk_buff *skb, u32 portid, const unsigned int *timeouts) {struct nlmsghdr *nlh; -struct nfgenmsg *nfmsg;unsigned int flags = portid ?NLM_F_MULTI :0 ;struct nlattr *nest_parms;int ret; event =nfnl_msg_type (NFNL_SUBSYS_CTNETLINK_TIMEOUT , event); - nlh =nlmsg_put (skb, portid, seq, event,sizeof (*nfmsg), flags); -if (nlh ==NULL ) + nlh =nfnl_msg_put (skb, portid, seq, event, flags,AF_UNSPEC , +NFNETLINK_V0 ,0 ); +if (!nlh) goto nlmsg_failure; - nfmsg =nlmsg_data (nlh); - nfmsg->nfgen_family =AF_UNSPEC ; - nfmsg->version =NFNETLINK_V0 ; - nfmsg->res_id =0 ; -if (nla_put_be16 (skb,CTA_TIMEOUT_L3PROTO ,htons (l3num)) ||nla_put_u8 (skb,CTA_TIMEOUT_L4PROTO , l4proto->l4proto)) goto nla_put_failure;
net/netfilter/nfnetlink_log.c +3 -8
@@ -452,20 +452,15 @@ __build_packet_message(struct nfnl_log_net *log, {struct nfulnl_msg_packet_hdr pmsg;struct nlmsghdr *nlh; -struct nfgenmsg *nfmsg;sk_buff_data_t old_tail = inst->skb->tail;struct sock *sk;const unsigned char *hwhdrp; - nlh =nlmsg_put (inst->skb,0 ,0 , -nfnl_msg_type (NFNL_SUBSYS_ULOG ,NFULNL_MSG_PACKET ), -sizeof (struct nfgenmsg ),0 ); + nlh =nfnl_msg_put (inst->skb,0 ,0 , +nfnl_msg_type (NFNL_SUBSYS_ULOG ,NFULNL_MSG_PACKET ), +0 , pf,NFNETLINK_V0 ,htons (inst->group_num));if (!nlh)return -1 ; - nfmsg =nlmsg_data (nlh); - nfmsg->nfgen_family = pf; - nfmsg->version =NFNETLINK_V0 ; - nfmsg->res_id =htons (inst->group_num);memset (&pmsg,0 ,sizeof (pmsg)); pmsg.hw_protocol = skb->protocol;
net/netfilter/nfnetlink_queue.c +4 -8
@@ -383,7 +383,6 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue,struct nlattr *nla;struct nfqnl_msg_packet_hdr *pmsg;struct nlmsghdr *nlh; -struct nfgenmsg *nfmsg;struct sk_buff *entskb = entry->skb;struct net_device *indev;struct net_device *outdev;
@@ -469,18 +468,15 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue, goto nlmsg_failure; } - nlh =nlmsg_put (skb,0 ,0 , -nfnl_msg_type (NFNL_SUBSYS_QUEUE ,NFQNL_MSG_PACKET ), -sizeof (struct nfgenmsg ),0 ); + nlh =nfnl_msg_put (skb,0 ,0 , +nfnl_msg_type (NFNL_SUBSYS_QUEUE ,NFQNL_MSG_PACKET ), +0 , entry->state.pf,NFNETLINK_V0 , +htons (queue->queue_num));if (!nlh) {skb_tx_error (entskb);kfree_skb (skb); goto nlmsg_failure; } - nfmsg =nlmsg_data (nlh); - nfmsg->nfgen_family = entry->state.pf; - nfmsg->version =NFNETLINK_V0 ; - nfmsg->res_id =htons (queue->queue_num); nla =__nla_reserve (skb,NFQA_PACKET_HDR ,sizeof (*pmsg)); pmsg =nla_data (nla);
net/netfilter/nft_compat.c +3 -8
@@ -591,19 +591,14 @@ nfnl_compat_fill_info(struct sk_buff *skb, u32 portid, u32 seq, u32 type, int rev, int target) {struct nlmsghdr *nlh; -struct nfgenmsg *nfmsg;unsigned int flags = portid ?NLM_F_MULTI :0 ; event =nfnl_msg_type (NFNL_SUBSYS_NFT_COMPAT , event); - nlh =nlmsg_put (skb, portid, seq, event,sizeof (*nfmsg), flags); -if (nlh ==NULL ) + nlh =nfnl_msg_put (skb, portid, seq, event, flags, family, +NFNETLINK_V0 ,0 ); +if (!nlh) goto nlmsg_failure; - nfmsg =nlmsg_data (nlh); - nfmsg->nfgen_family = family; - nfmsg->version =NFNETLINK_V0 ; - nfmsg->res_id =0 ; -if (nla_put_string (skb,NFTA_COMPAT_NAME , name) ||nla_put_be32 (skb,NFTA_COMPAT_REV ,htonl (rev)) ||nla_put_be32 (skb,NFTA_COMPAT_TYPE ,htonl (target)))
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 4/10 netfilter: nf_tables: use net_generic infra for transaction data
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
[ 0854db2aaef3fcdd3498a9d299c60adea2aa3dc6 ]
This moves all nf_tables pernet data from struct net to a net_generic extension, with the exception of the gencursor.
The latter is used in the data path and also outside of the nf_tables core. All others are only used from the configuration plane.
--- include/net/netfilter/nf_tables.h | 10 + include/net/netns/nftables.h | 6 - net/netfilter/nf_tables_api.c | 330 ++++++++++++++++++------------ net/netfilter/nf_tables_offload.c | 29 ++- net/netfilter/nft_chain_filter.c | 11 +- net/netfilter/nft_dynset.c | 6 +- 6 files changed, 245 insertions(+), 147 deletions(-)
include/net/netfilter/nf_tables.h +10 -0
@@ -1472,4 +1472,14 @@ void nf_tables_trans_destroy_flush_work(void);int nf_msecs_to_jiffies64 (const struct nlattr *nla,u64 *result);__be64 nf_jiffies64_to_msecs (u64 input); +struct nftables_pernet { +struct list_head tables; +struct list_head commit_list; +struct list_head module_list; +struct list_head notify_list; +struct mutex commit_mutex; +unsigned int base_seq; +u8 validate_state; +}; +#endif /* _NET_NF_TABLES_H */
include/net/netns/nftables.h +0 -6
@@ -5,13 +5,7 @@#include <linux/list.h> struct netns_nftables { -struct list_head tables; -struct list_head commit_list; -struct list_head module_list; -struct mutex commit_mutex; -unsigned int base_seq;u8 gencursor; -u8 validate_state; };#endif
net/netfilter/nf_tables_api.c +204 -126
905 lines not on this page · raw message
net/netfilter/nf_tables_offload.c +18 -11
@@ -7,6 +7,8 @@#include <net/netfilter/nf_tables_offload.h> #include <net/pkt_cls.h> +extern unsigned int nf_tables_net_id; +static struct nft_flow_rule *nft_flow_rule_alloc (int num_actions) {struct nft_flow_rule *flow;
@@ -345,11 +347,12 @@ static int nft_flow_offload_chain(struct nft_chain *chain,int nft_flow_rule_offload_commit (struct net *net) { +struct nftables_pernet *nft_net =net_generic (net, nf_tables_net_id);struct nft_trans *trans;int err =0 ;u8 policy; -list_for_each_entry (trans, &net->nft.commit_list, list) { +list_for_each_entry (trans, &nft_net->commit_list, list) {if (trans->ctx.family !=NFPROTO_NETDEV )continue ;
@@ -400,7 +403,7 @@ int nft_flow_rule_offload_commit(struct net *net)break ; } -list_for_each_entry (trans, &net->nft.commit_list, list) { +list_for_each_entry (trans, &nft_net->commit_list, list) {if (trans->ctx.family !=NFPROTO_NETDEV )continue ;
@@ -419,14 +422,14 @@ int nft_flow_rule_offload_commit(struct net *net)return err; } -static struct nft_chain *__nft_offload_get_chain (struct net_device *dev) +static struct nft_chain *__nft_offload_get_chain (const struct nftables_pernet *nft_net, +struct net_device *dev) {struct nft_base_chain *basechain; -struct net *net =dev_net (dev);const struct nft_table *table;struct nft_chain *chain; -list_for_each_entry (table, &net->nft.tables, list) { +list_for_each_entry (table, &nft_net->tables, list) {if (table->family !=NFPROTO_NETDEV )continue ;
@@ -450,18 +453,20 @@ static void nft_indr_block_cb(struct net_device *dev, flow_indr_block_bind_cb_t *cb, void *cb_priv, enum flow_block_command cmd) { +struct nftables_pernet *nft_net;struct net *net =dev_net (dev);struct nft_chain *chain; -mutex_lock (&net->nft.commit_mutex); - chain =__nft_offload_get_chain (dev); + nft_net =net_generic (net, nf_tables_net_id); +mutex_lock (&nft_net->commit_mutex); + chain =__nft_offload_get_chain (nft_net, dev);if (chain && chain->flags &NFT_CHAIN_HW_OFFLOAD ) {struct nft_base_chain *basechain; basechain =nft_base_chain (chain);nft_indr_block_ing_cmd (dev, basechain, cb, cb_priv, cmd); } -mutex_unlock (&net->nft.commit_mutex); +mutex_unlock (&nft_net->commit_mutex); }static void nft_offload_chain_clean (struct nft_chain *chain)
@@ -480,17 +485,19 @@ static int nft_offload_netdev_event(struct notifier_block *this, unsigned long event, void *ptr) { struct net_device *dev = netdev_notifier_info_to_dev(ptr); +struct nftables_pernet *nft_net;struct net *net =dev_net (dev);struct nft_chain *chain;if (event !=NETDEV_UNREGISTER )return NOTIFY_DONE ; -mutex_lock (&net->nft.commit_mutex); - chain =__nft_offload_get_chain (dev); + nft_net =net_generic (net, nf_tables_net_id); +mutex_lock (&nft_net->commit_mutex); + chain =__nft_offload_get_chain (nft_net, dev);if (chain)nft_offload_chain_clean (chain); -mutex_unlock (&net->nft.commit_mutex); +mutex_unlock (&nft_net->commit_mutex);return NOTIFY_DONE ; }
net/netfilter/nft_chain_filter.c +8 -3
@@ -2,6 +2,7 @@#include <linux/kernel.h> #include <linux/netdevice.h> #include <net/net_namespace.h> +#include <net/netns/generic.h> #include <net/netfilter/nf_tables.h> #include <linux/netfilter_ipv4.h> #include <linux/netfilter_ipv6.h>
@@ -10,6 +11,8 @@#include <net/netfilter/nf_tables_ipv4.h> #include <net/netfilter/nf_tables_ipv6.h> +extern unsigned int nf_tables_net_id; +#ifdef CONFIG_NF_TABLES_IPV4 static unsigned int nft_do_chain_ipv4(void *priv, struct sk_buff *skb,
@@ -315,6 +318,7 @@ static int nf_tables_netdev_event(struct notifier_block *this, unsigned long event, void *ptr) { struct net_device *dev = netdev_notifier_info_to_dev(ptr); +struct nftables_pernet *nft_net;struct nft_table *table;struct nft_chain *chain, *nr; struct nft_ctx ctx = {
@@ -325,8 +329,9 @@ static int nf_tables_netdev_event(struct notifier_block *this, event != NETDEV_CHANGENAME)return NOTIFY_DONE ; -mutex_lock (&ctx.net->nft.commit_mutex); -list_for_each_entry (table, &ctx.net->nft.tables, list) { + nft_net =net_generic (ctx.net, nf_tables_net_id); +mutex_lock (&nft_net->commit_mutex); +list_for_each_entry (table, &nft_net->tables, list) {if (table->family !=NFPROTO_NETDEV )continue ;
@@ -340,7 +345,7 @@ static int nf_tables_netdev_event(struct notifier_block *this,nft_netdev_event (event, dev, &ctx); } } -mutex_unlock (&ctx.net->nft.commit_mutex); +mutex_unlock (&nft_net->commit_mutex);return NOTIFY_DONE ; }
net/netfilter/nft_dynset.c +5 -1
@@ -11,6 +11,9 @@#include <linux/netfilter/nf_tables.h> #include <net/netfilter/nf_tables.h> #include <net/netfilter/nf_tables_core.h> +#include <net/netns/generic.h> + +extern unsigned int nf_tables_net_id;struct nft_dynset {struct nft_set *set;
@@ -129,13 +132,14 @@ static int nft_dynset_init(const struct nft_ctx *ctx,const struct nft_expr *expr, const struct nlattr * const tb[]) { + struct nftables_pernet *nft_net = net_generic(ctx->net, nf_tables_net_id);struct nft_dynset *priv =nft_expr_priv (expr);u8 genmask =nft_genmask_next (ctx->net);struct nft_set *set;u64 timeout;int err; -lockdep_assert_held (&ctx->net->nft.commit_mutex); +lockdep_assert_held (&nft_net->commit_mutex); if (tb[NFTA_DYNSET_SET_NAME] == NULL || tb[NFTA_DYNSET_OP] == NULL ||
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 5/10 netfilter: nf_tables: add rescheduling points during loop detection walks
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
[ 81ea010667417ef3f218dfd99b69769fe66c2b67 ]
Add explicit rescheduling points during ruleset walk.
Switching to a faster algorithm is possible but this is a much smaller change, suitable for nf tree.
--- net/netfilter/nf_tables_api.c | 6 ++++++ 1 file changed, 6 insertions(+)
net/netfilter/nf_tables_api.c +6 -0
@@ -2712,6 +2712,8 @@ int nft_chain_validate(const struct nft_ctx *ctx, const struct nft_chain *chain)if (err <0 )return err; } + +cond_resched (); }return 0 ;
@@ -7379,9 +7381,13 @@ static int nf_tables_check_loops(const struct nft_ctx *ctx,break ; } } + +cond_resched (); }list_for_each_entry (set, &ctx->table->sets, list) { +cond_resched (); +if (!nft_is_active_next (ctx->net, set))continue ; if (!(set->flags & NFT_SET_MAP) ||
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 6/10 netfilter: nf_tables: incorrect error path handling with NFT_MSG_NEWRULE
In reply to Pablo Neira Ayuso[ 1240eb93f0616b21c675416516ff3d74798fdc97 ]
In case of error when adding a new rule that refers to an anonymous set, deactivate expressions via NFT_TRANS_PREPARE state, not NFT_TRANS_RELEASE. Thus, the lookup expression marks anonymous sets as inactive in the next generation to ensure it is not reachable in this transaction anymore and decrement the set refcount as introduced by c1592a89942e ("netfilter:nf_tables: deactivate anonymous set from preparation phase"). The abort step takes care of undoing the anonymous set.
This is also consistent with rule deletion, where NFT_TRANS_PREPARE is used. Note that this error path is exercised in the preparation step of the commit protocol. This patch replaces nf_tables_rule_release() by the deactivate and destroy calls, this time with NFT_TRANS_PREPARE.
Due to this incorrect error handling, it is possible to access a dangling pointer to the anonymous set that remains in the transaction list.
[1009.379054] BUG: KASAN: use-after-free in nft_set_lookup_global+0x147/0x1a0 [nf_tables] [1009.379106] Read of size 8 at addr ffff88816c4c8020 by task nft-rule-add/137110 [1009.379116] CPU: 7 PID: 137110 Comm: nft-rule-add Not tainted 6.4.0-rc4+ #256 [1009.379128] Call Trace: [1009.379132] <TASK> [1009.379135] dump_stack_lvl+0x33/0x50 [1009.379146] ? nft_set_lookup_global+0x147/0x1a0 [nf_tables] [1009.379191] print_address_description.constprop.0+0x27/0x300 [1009.379201] kasan_report+0x107/0x120 [1009.379210] ? nft_set_lookup_global+0x147/0x1a0 [nf_tables] [1009.379255] nft_set_lookup_global+0x147/0x1a0 [nf_tables] [1009.379302] nft_lookup_init+0xa5/0x270 [nf_tables] [1009.379350] nf_tables_newrule+0x698/0xe50 [nf_tables] [1009.379397] ? nf_tables_rule_release+0xe0/0xe0 [nf_tables] [1009.379441] ? kasan_unpoison+0x23/0x50 [1009.379450] nfnetlink_rcv_batch+0x97c/0xd90 [nfnetlink] [1009.379470] ? nfnetlink_rcv_msg+0x480/0x480 [nfnetlink] [1009.379485] ? __alloc_skb+0xb8/0x1e0 [1009.379493] ? __alloc_skb+0xb8/0x1e0 [1009.379502] ? entry_SYSCALL_64_after_hwframe+0x46/0xb0 [1009.379509] ? unwind_get_return_address+0x2a/0x40 [1009.379517] ? write_profile+0xc0/0xc0 [1009.379524] ? avc_lookup+0x8f/0xc0 [1009.379532] ? __rcu_read_unlock+0x43/0x60
--- net/netfilter/nf_tables_api.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/netfilter/nf_tables_api.c +2 -1
@@ -2939,7 +2939,8 @@ static int nf_tables_newrule(struct net *net, struct sock *nlsk,return 0 ; err2: -nf_tables_rule_release (&ctx, rule); +nft_rule_expr_deactivate (&ctx, rule,NFT_TRANS_PREPARE ); +nf_tables_rule_destroy (&ctx, rule); err1:for (i =0 ; i < n; i++) {if (info[i].ops) {
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 7/10 netfilter: nf_tables: add NFT_TRANS_PREPARE_ERROR to deal with bound set/chain
In reply to Pablo Neira Ayuso[ 26b5a5712eb85e253724e56a54c17f8519bd8e4e ]
Add a new state to deal with rule expressions deactivation from the newrule error path, otherwise the anonymous set remains in the list in inactive state for the next generation. Mark the set/chain transaction as unbound so the abort path releases this object, set it as inactive in the next generation so it is not reachable anymore from this transaction and reference counter is dropped.
--- include/net/netfilter/nf_tables.h | 1 + net/netfilter/nf_tables_api.c | 27 +++++++++++++++++++++++---- 2 files changed, 24 insertions(+), 4 deletions(-)
include/net/netfilter/nf_tables.h +1 -0
@@ -756,6 +756,7 @@ struct nft_expr_type {enum nft_trans_phase {NFT_TRANS_PREPARE , +NFT_TRANS_PREPARE_ERROR ,NFT_TRANS_ABORT ,NFT_TRANS_COMMIT ,NFT_TRANS_RELEASE
net/netfilter/nf_tables_api.c +23 -4
@@ -137,7 +137,8 @@ static void nft_trans_destroy(struct nft_trans *trans)kfree (trans); } -static void nft_set_trans_bind (const struct nft_ctx *ctx,struct nft_set *set) +static void __nft_set_trans_bind (const struct nft_ctx *ctx,struct nft_set *set, +bool bind) {struct nftables_pernet *nft_net;struct net *net = ctx->net;
@@ -151,16 +152,26 @@ static void nft_set_trans_bind(const struct nft_ctx *ctx, struct nft_set *set)switch (trans->msg_type) {case NFT_MSG_NEWSET :if (nft_trans_set (trans) == set) -nft_trans_set_bound (trans) = true; +nft_trans_set_bound (trans) = bind;break ;case NFT_MSG_NEWSETELEM :if (nft_trans_elem_set (trans) == set) -nft_trans_elem_set_bound (trans) = true; +nft_trans_elem_set_bound (trans) = bind;break ; } } } +static void nft_set_trans_bind (const struct nft_ctx *ctx,struct nft_set *set) +{ +return __nft_set_trans_bind (ctx, set, true); +} + +static void nft_set_trans_unbind (const struct nft_ctx *ctx,struct nft_set *set) +{ +return __nft_set_trans_bind (ctx, set, false); +} +static void nft_trans_commit_list_add_tail (struct net *net,struct nft_trans *trans) {struct nftables_pernet *nft_net;
@@ -2939,7 +2950,7 @@ static int nf_tables_newrule(struct net *net, struct sock *nlsk,return 0 ; err2: -nft_rule_expr_deactivate (&ctx, rule,NFT_TRANS_PREPARE ); +nft_rule_expr_deactivate (&ctx, rule,NFT_TRANS_PREPARE_ERROR );nf_tables_rule_destroy (&ctx, rule); err1:for (i =0 ; i < n; i++) {
@@ -3959,6 +3970,13 @@ void nf_tables_deactivate_set(const struct nft_ctx *ctx, struct nft_set *set, enum nft_trans_phase phase) {switch (phase) { +case NFT_TRANS_PREPARE_ERROR : +nft_set_trans_unbind (ctx, set); +if (nft_set_is_anonymous (set)) +nft_deactivate_next (ctx->net, set); + + set->use--; +break ;case NFT_TRANS_PREPARE :if (nft_set_is_anonymous (set))nft_deactivate_next (ctx->net, set);
@@ -5724,6 +5742,7 @@ void nf_tables_deactivate_flowtable(const struct nft_ctx *ctx, enum nft_trans_phase phase) {switch (phase) { +case NFT_TRANS_PREPARE_ERROR :case NFT_TRANS_PREPARE :case NFT_TRANS_ABORT :case NFT_TRANS_RELEASE :
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 8/10 netfilter: nf_tables: reject unbound anonymous set before commit phase
In reply to Pablo Neira Ayuso[ 938154b93be8cd611ddfd7bafc1849f3c4355201 ]
Add a new list to track set transaction and to check for unbound anonymous sets before entering the commit phase.
Bail out at the end of the transaction handling if an anonymous set remains unbound.
--- include/net/netfilter/nf_tables.h | 3 +++ net/netfilter/nf_tables_api.c | 36 ++++++++++++++++++++++++++----- 2 files changed, 34 insertions(+), 5 deletions(-)
include/net/netfilter/nf_tables.h +3 -0
@@ -1364,6 +1364,7 @@ static inline void nft_set_elem_clear_busy(struct nft_set_ext *ext)* struct nft_trans - nf_tables object update in transaction * * @list: used internally +* @binding_list: list of objects with possible bindings * @msg_type: message type * @put_net: ctx->net needs to be put * @ctx: transaction context
@@ -1371,6 +1372,7 @@ static inline void nft_set_elem_clear_busy(struct nft_set_ext *ext)*/ struct nft_trans {struct list_head list; +struct list_head binding_list;int msg_type;bool put_net;struct nft_ctx ctx;
@@ -1476,6 +1478,7 @@ __be64 nf_jiffies64_to_msecs(u64 input);struct nftables_pernet {struct list_head tables;struct list_head commit_list; +struct list_head binding_list;struct list_head module_list;struct list_head notify_list;struct mutex commit_mutex;
net/netfilter/nf_tables_api.c +31 -5
@@ -119,6 +119,7 @@ static struct nft_trans *nft_trans_alloc_gfp(const struct nft_ctx *ctx,return NULL ;INIT_LIST_HEAD (&trans->list); +INIT_LIST_HEAD (&trans->binding_list); trans->msg_type = msg_type; trans->ctx = *ctx;
@@ -131,9 +132,15 @@ static struct nft_trans *nft_trans_alloc(const struct nft_ctx *ctx,return nft_trans_alloc_gfp (ctx, msg_type, size,GFP_KERNEL ); } -static void nft_trans_destroy (struct nft_trans *trans) +static void nft_trans_list_del (struct nft_trans *trans) {list_del (&trans->list); +list_del (&trans->binding_list); +} + +static void nft_trans_destroy (struct nft_trans *trans) +{ +nft_trans_list_del (trans);kfree (trans); }
@@ -174,9 +181,15 @@ static void nft_set_trans_unbind(const struct nft_ctx *ctx, struct nft_set *set)static void nft_trans_commit_list_add_tail (struct net *net,struct nft_trans *trans) { -struct nftables_pernet *nft_net; +struct nftables_pernet *nft_net =net_generic (net, nf_tables_net_id); + +switch (trans->msg_type) { +case NFT_MSG_NEWSET : +if (nft_set_is_anonymous (nft_trans_set (trans))) +list_add_tail (&trans->binding_list, &nft_net->binding_list); +break ; + } - nft_net =net_generic (net, nf_tables_net_id);list_add_tail (&trans->list, &nft_net->commit_list); }
@@ -6697,7 +6710,7 @@ static void nf_tables_trans_destroy_work(struct work_struct *w)synchronize_rcu ();list_for_each_entry_safe (trans, next, &head, list) { -list_del (&trans->list); +nft_trans_list_del (trans);nft_commit_release (trans); } }
@@ -6901,6 +6914,18 @@ static int nf_tables_commit(struct net *net, struct sk_buff *skb)return 0 ; } +list_for_each_entry (trans, &nft_net->binding_list, binding_list) { +switch (trans->msg_type) { +case NFT_MSG_NEWSET : +if (nft_set_is_anonymous (nft_trans_set (trans)) && + !nft_trans_set_bound (trans)) { +pr_warn_once ("nftables ruleset with unbound set\n" ); +return -EINVAL ; + } +break ; + } + } +/* 0. Validate ruleset, otherwise roll back for error reporting. */ if (nf_tables_validate (net) <0 )return -EAGAIN ;
@@ -7249,7 +7274,7 @@ static int __nf_tables_abort(struct net *net, enum nfnl_abort_action action)list_for_each_entry_safe_reverse (trans, next, &nft_net->commit_list, list) { -list_del (&trans->list); +nft_trans_list_del (trans);nf_tables_abort_release (trans); }
@@ -7914,6 +7939,7 @@ static int __net_init nf_tables_init_net(struct net *net)INIT_LIST_HEAD (&nft_net->tables);INIT_LIST_HEAD (&nft_net->commit_list); +INIT_LIST_HEAD (&nft_net->binding_list);INIT_LIST_HEAD (&nft_net->module_list);INIT_LIST_HEAD (&nft_net->notify_list);mutex_init (&nft_net->commit_mutex);
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 9/10 netfilter: nf_tables: unbind non-anonymous set if rule construction fails
In reply to Pablo Neira Ayuso[ 3e70489721b6c870252c9082c496703677240f53 ]
Otherwise a dangling reference to a rule object that is gone remains in the set binding list.
--- net/netfilter/nf_tables_api.c | 2 ++ 1 file changed, 2 insertions(+)
net/netfilter/nf_tables_api.c +2 -0
@@ -3987,6 +3987,8 @@ void nf_tables_deactivate_set(const struct nft_ctx *ctx, struct nft_set *set,nft_set_trans_unbind (ctx, set);if (nft_set_is_anonymous (set))nft_deactivate_next (ctx->net, set); +else +list_del_rcu (&binding->list); set->use--;break ;
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 10/10 netfilter: nf_tables: fix scheduling-while-atomic splat
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
[ 2024439bd5ceb145eeeb428b2a59e9b905153ac3 ]
nf_tables_check_loops() can be called from rhashtable list walk so cond_resched() cannot be used here.
--- net/netfilter/nf_tables_api.c | 4 ---- 1 file changed, 4 deletions(-)
net/netfilter/nf_tables_api.c +0 -4
@@ -7428,13 +7428,9 @@ static int nf_tables_check_loops(const struct nft_ctx *ctx,break ; } } - -cond_resched (); }list_for_each_entry (set, &ctx->table->sets, list) { -cond_resched (); -if (!nft_is_active_next (ctx->net, set))continue ; if (!(set->flags & NFT_SET_MAP) ||
Signature · 1 line
2.30.2
Greg KH
maintainerQuoted 19 lines · Pablo Neira Ayuso
Hi Greg, Sasha,
The following list shows the backported patches, I am using original commit IDs for reference:
1)
1e9451cbda45("netfilter:nf_tables: fix nat hook table deletion")2)
802b805162a1("netfilter: nftables: add helper function to set the base sequence number")3)
19c28b1374fb("netfilter: add helper function to set up the nfnetlink header and use it")4)
0854db2aaef3("netfilter:nf_tables: usenet_genericinfra for transaction data")5)
81ea01066741("netfilter:nf_tables: add rescheduling points during loop detection walks")6)
1240eb93f061("netfilter:nf_tables: incorrect error path handling withNFT_MSG_NEWRULE")7)
26b5a5712eb8("netfilter:nf_tables: addNFT_TRANS_PREPARE_ERRORto deal with bound set/chain")
Quoted 7 lines
8)
938154b93be8("netfilter:nf_tables: reject unbound anonymous set before commit phase")9)
3e70489721b6("netfilter:nf_tables: unbind non-anonymous set if rule construction fails")10)
2024439bd5ce("netfilter:nf_tables: fix scheduling-while-atomic splat")Please, apply,
Sorry for the delay, now queued up.
greg k-h