Netfilter fixes for net
Subsystems (5)
Pablo Neira Ayuso
maintainercover Netfilter fixes for net
Hi,
The following patchset contains Netfilter fixes for net:
1) Ignores ifindex for types other than mcast/linklocal in ipv6 frag reasm, from Tom Hughes.
2) Initialize extack for begin/end netlink message marker in batch, from Donald Hunter.
3) Initialize extack for flowtable offload support, also from Donald.
4) Dropped packets with cloned unconfirmed conntracks in nfqueue, later it should be possible to explore lookup after reinject but Florian prefers this approach at this stage. From Florian Westphal.
5) Add selftest for cloned unconfirmed conntracks in nfqueue for previous update.
6) Audit after filling netlink header successfully in object dump, from Phil Sutter.
7-8) Fix concurrent dump and reset which could result in underflow
counter / quota objects.
Please, pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git nf-24-08-15
Thanks.
----------------------------------------------------------------
The following changes since commit a2cbb1603943281a604f5adc48079a148db5cb0d:
tcp: Update window clamping condition (2024-08-14 10:50:49 +0100)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git tags/nf-24-08-15
for you to fetch changes up to bd662c4218f9648e888bebde9468146965f3f8a0:
netfilter: nf_tables: Add locking for NFT_MSG_GETOBJ_RESET requests (2024-08-14 23:44:55 +0200)
----------------------------------------------------------------
netfilter pull request 24-08-15
----------------------------------------------------------------
Donald Hunter (2):
netfilter: nfnetlink: Initialise extack before use in ACKs
netfilter: flowtable: initialise extack before use
Florian Westphal (2):
netfilter: nf_queue: drop packets with cloned unconfirmed conntracks
selftests: netfilter: add test for br_netfilter+conntrack+queue combination
Phil Sutter (3):
netfilter: nf_tables: Audit log dump reset after the fact
netfilter: nf_tables: Introduce nf_tables_getobj_single
netfilter: nf_tables: Add locking for NFT_MSG_GETOBJ_RESET requests
Tom Hughes (1):
netfilter: allow ipv6 fragments to arrive on different devices
net/bridge/br_netfilter_hooks.c | 6 +- net/ipv6/netfilter/nf_conntrack_reasm.c | 4 + net/netfilter/nf_flow_table_offload.c | 2 +- net/netfilter/nf_tables_api.c | 147 ++++++++++++++------- net/netfilter/nfnetlink.c | 5 +- net/netfilter/nfnetlink_queue.c | 35 ++++- tools/testing/selftests/net/netfilter/Makefile | 1 + .../selftests/net/netfilter/br_netfilter_queue.sh | 78 +++++++++++ 8 files changed, 228 insertions(+), 50 deletions(-) create mode 100755 tools/testing/selftests/net/netfilter/br_netfilter_queue.sh
Pablo Neira Ayuso
maintainerPATCH 1/8 netfilter: allow ipv6 fragments to arrive on different devices
From: Tom Hughes <[email protected]>
Commit 264640fc2c5f4 ("ipv6: distinguish frag queues by device for multicast and link-local packets") modified the ipv6 fragment reassembly logic to distinguish frag queues by device for multicast and link-local packets but in fact only the main reassembly code limits the use of the device to those address types and the netfilter reassembly code uses the device for all packets.
This means that if fragments of a packet arrive on different interfaces then netfilter will fail to reassemble them and the fragments will be expired without going any further through the filters.
--- net/ipv6/netfilter/nf_conntrack_reasm.c | 4 ++++ 1 file changed, 4 insertions(+)
net/ipv6/netfilter/nf_conntrack_reasm.c +4 -0
@@ -154,6 +154,10 @@ static struct frag_queue *fq_find(struct net *net, __be32 id, u32 user, };struct inet_frag_queue *q; +if (!(ipv6_addr_type (&hdr->daddr) & (IPV6_ADDR_MULTICAST | +IPV6_ADDR_LINKLOCAL ))) + key.iif =0 ; + q =inet_frag_find (nf_frag->fqdir, &key);if (!q)return NULL ;
Signature · 1 line
2.30.2
Re: [PATCH net 1/8] netfilter: allow ipv6 fragments to arrive on different devices
This series was applied to netdev/net.git (main) by Pablo Neira Ayuso <[email protected]>:
Hello:
This series was applied to netdev/net.git (main)
by Pablo Neira Ayuso <[email protected]>:
Quoted 10 lines · On Thu, 15 Aug 2024 00:20:35 +0200 you wrote:
From: Tom Hughes <[email protected]>
Commit
264640fc2c5f4("ipv6: distinguish frag queues by device for multicast and link-local packets") modified the ipv6 fragment reassembly logic to distinguish frag queues by device for multicast and link-local packets but in fact only the main reassembly code limits the use of the device to those address types and the netfilter reassembly code uses the device for all packets.[...]
Here is the summary with links:
- [net,1/8] netfilter: allow ipv6 fragments to arrive on different devices
https://git.kernel.org/netdev/net/c/3cd740b98596 - [net,2/8] netfilter: nfnetlink: Initialise extack before use in ACKs https://git.kernel.org/netdev/net/c/d1a7b382a9d3 - [net,3/8] netfilter: flowtable: initialise extack before use https://git.kernel.org/netdev/net/c/e9767137308d - [net,4/8] netfilter: nf_queue: drop packets with cloned unconfirmed conntracks https://git.kernel.org/netdev/net/c/7d8dc1c7be8d - [net,5/8] selftests: netfilter: add test for br_netfilter+conntrack+queue combination https://git.kernel.org/netdev/net/c/ea2306f0330c - [net,6/8] netfilter: nf_tables: Audit log dump reset after the fact https://git.kernel.org/netdev/net/c/e0b6648b0446 - [net,7/8] netfilter: nf_tables: Introduce nf_tables_getobj_single https://git.kernel.org/netdev/net/c/69fc3e9e90f1 - [net,8/8] netfilter: nf_tables: Add locking for NFT_MSG_GETOBJ_RESET requests https://git.kernel.org/netdev/net/c/bd662c4218f9
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/8 netfilter: nfnetlink: Initialise extack before use in ACKs
In reply to Pablo Neira AyusoFrom: Donald Hunter <[email protected]>
Add missing extack initialisation when ACKing BATCH_BEGIN and BATCH_END.
--- net/netfilter/nfnetlink.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
net/netfilter/nfnetlink.c +4 -1
@@ -427,8 +427,10 @@ static void nfnetlink_rcv_batch(struct sk_buff *skb, struct nlmsghdr *nlh,nfnl_unlock (subsys_id); -if (nlh->nlmsg_flags &NLM_F_ACK ) +if (nlh->nlmsg_flags &NLM_F_ACK ) { +memset (&extack,0 ,sizeof (extack));nfnl_err_add (&err_list, nlh,0 , &extack); + }while (skb->len >=nlmsg_total_size (0 )) {int msglen, type;
@@ -577,6 +579,7 @@ static void nfnetlink_rcv_batch(struct sk_buff *skb, struct nlmsghdr *nlh, ss->abort (net, oskb,NFNL_ABORT_NONE );netlink_ack (oskb,nlmsg_hdr (oskb), err,NULL ); }else if (nlh->nlmsg_flags &NLM_F_ACK ) { +memset (&extack,0 ,sizeof (extack));nfnl_err_add (&err_list, nlh,0 , &extack); } }else {
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 3/8 netfilter: flowtable: initialise extack before use
In reply to Pablo Neira AyusoFrom: Donald Hunter <[email protected]>
Fix missing initialisation of extack in flow offload.
--- net/netfilter/nf_flow_table_offload.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nf_flow_table_offload.c +1 -1
@@ -841,8 +841,8 @@ static int nf_flow_offload_tuple(struct nf_flowtable *flowtable, struct list_head *block_cb_list) {struct flow_cls_offload cls_flow = {}; +struct netlink_ext_ack extack = {};struct flow_block_cb *block_cb; -struct netlink_ext_ack extack;__be16 proto =ETH_P_ALL ;int err, i =0 ;
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 4/8 netfilter: nf_queue: drop packets with cloned unconfirmed conntracks
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
Conntrack assumes an unconfirmed entry (not yet committed to global hash table) has a refcount of 1 and is not visible to other cores.
With multicast forwarding this assumption breaks down because such skbs get cloned after being picked up, i.e. ct->use refcount is > 1.
Likewise, bridge netfilter will clone broad/mutlicast frames and all frames in case they need to be flood-forwarded during learning phase.
For ip multicast forwarding or plain bridge flood-forward this will "work" because packets don't leave softirq and are implicitly serialized.
With nfqueue this no longer holds true, the packets get queued and can be reinjected in arbitrary ways.
Disable this feature, I see no other solution.
After this patch, nfqueue cannot queue packets except the last multicast/broadcast packet.
--- net/bridge/br_netfilter_hooks.c | 6 +++++- net/netfilter/nfnetlink_queue.c | 35 +++++++++++++++++++++++++++++++-- 2 files changed, 38 insertions(+), 3 deletions(-)
net/bridge/br_netfilter_hooks.c +5 -1
@@ -622,8 +622,12 @@ static unsigned int br_nf_local_in(void *priv,if (likely (nf_ct_is_confirmed (ct)))return NF_ACCEPT ; +if (WARN_ON_ONCE (refcount_read (&nfct->use) !=1 )) { +nf_reset_ct (skb); +return NF_ACCEPT ; + } +WARN_ON_ONCE (skb_shared (skb)); -WARN_ON_ONCE (refcount_read (&nfct->use) !=1 );/* We can't call nf_confirm here, it would create a dependency * on nf_conntrack module.
net/netfilter/nfnetlink_queue.c +33 -2
@@ -820,10 +820,41 @@ static bool nf_ct_drop_unconfirmed(const struct nf_queue_entry *entry) {#if IS_ENABLED (CONFIG_NF_CONNTRACK )static const unsigned long flags =IPS_CONFIRMED |IPS_DYING ; -const struct nf_conn *ct = (void *)skb_nfct (entry->skb); +struct nf_conn *ct = (void *)skb_nfct (entry->skb); +unsigned long status; +unsigned int use; -if (ct && ((ct->status & flags) ==IPS_DYING )) +if (!ct) +return false; + + status =READ_ONCE (ct->status); +if ((status & flags) ==IPS_DYING )return true; + +if (status &IPS_CONFIRMED ) +return false; + +/* in some cases skb_clone() can occur after initial conntrack +* pickup, but conntrack assumes exclusive skb->_nfct ownership for +* unconfirmed entries. +* +* This happens for br_netfilter and with ip multicast routing. +* We can't be solved with serialization here because one clone could +* have been queued for local delivery. +*/ + use =refcount_read (&ct->ct_general.use); +if (likely (use ==1 )) +return false; + +/* Can't decrement further? Exclusive ownership. */ +if (!refcount_dec_not_one (&ct->ct_general.use)) +return false; + +skb_set_nfct (entry->skb,0 ); +/* No nf_ct_put(): we already decremented .use and it cannot +* drop down to 0. +*/ +return true;#endif return false; }
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 5/8 selftests: netfilter: add test for br_netfilter+conntrack+queue combination
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
Trigger cloned skbs leaving softirq protection. This triggers splat without the preceeding change ("netfilter: nf_queue: drop packets with cloned unconfirmed
conntracks"):
WARNING: at net/netfilter/nf_conntrack_core.c:1198 __nf_conntrack_confirm..
because local delivery and forwarding will race for confirmation.
Based on a reproducer script from Yi Chen.
--- .../testing/selftests/net/netfilter/Makefile | 1 + .../net/netfilter/br_netfilter_queue.sh | 78 +++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100755 tools/testing/selftests/net/netfilter/br_netfilter_queue.sh
tools/testing/selftests/net/netfilter/Makefile +1 -0
@@ -7,6 +7,7 @@ MNL_CFLAGS := $(shell $(HOSTPKG_CONFIG) --cflags libmnl 2>/dev/null) MNL_LDLIBS := $(shell $(HOSTPKG_CONFIG) --libs libmnl 2>/dev/null || echo -lmnl) TEST_PROGS := br_netfilter.sh bridge_brouter.sh +TEST_PROGS += br_netfilter_queue.sh TEST_PROGS += conntrack_icmp_related.sh TEST_PROGS += conntrack_ipip_mtu.sh TEST_PROGS += conntrack_tcp_unreplied.sh
tools/testing/selftests/net/netfilter/br_netfilter_queue.sh new file +78 -0
78 lines not on this page · raw message
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 6/8 netfilter: nf_tables: Audit log dump reset after the fact
In reply to Pablo Neira AyusoFrom: Phil Sutter <[email protected]>
In theory, dumpreset may fail and invalidate the preceeding log message. Fix this and use the occasion to prepare for object reset locking, which benefits from a few unrelated changes:
* Add an early call to nfnetlink_unicast if not resetting which effectively skips the audit logging but also unindents it.
* Extract the table's name from the netlink attribute (which is verified via earlier table lookup) to not rely upon validity of the looked up table pointer.
* Do not use local variable family, it will vanish.
--- net/netfilter/nf_tables_api.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-)
net/netfilter/nf_tables_api.c +13 -15
@@ -8055,6 +8055,7 @@ static int nf_tables_dump_obj_done(struct netlink_callback *cb)static int nf_tables_getobj (struct sk_buff *skb,const struct nfnl_info *info,const struct nlattr *const nla[]) { +const struct nftables_pernet *nft_net =nft_pernet (info->net);struct netlink_ext_ack *extack = info->extack;u8 genmask =nft_genmask_cur (info->net);u8 family = info->nfmsg->nfgen_family;
@@ -8064,6 +8065,7 @@ static int nf_tables_getobj(struct sk_buff *skb, const struct nfnl_info *info,struct sk_buff *skb2;bool reset = false;u32 objtype; +char *buf;int err;if (info->nlh->nlmsg_flags &NLM_F_DUMP ) {
@@ -8102,27 +8104,23 @@ static int nf_tables_getobj(struct sk_buff *skb, const struct nfnl_info *info,if (NFNL_MSG_TYPE (info->nlh->nlmsg_type) ==NFT_MSG_GETOBJ_RESET ) reset = true; -if (reset) { -const struct nftables_pernet *nft_net; -char *buf; - - nft_net =nft_pernet (net); - buf =kasprintf (GFP_ATOMIC ,"%s:%u" , table->name, nft_net->base_seq); - -audit_log_nfcfg (buf, - family, -1 , -AUDIT_NFT_OP_OBJ_RESET , -GFP_ATOMIC ); -kfree (buf); - } - err =nf_tables_fill_obj_info (skb2, net,NETLINK_CB (skb).portid, info->nlh->nlmsg_seq,NFT_MSG_NEWOBJ ,0 , family, table, obj, reset);if (err <0 ) goto err_fill_obj_info; +if (!reset) +return nfnetlink_unicast (skb2, net,NETLINK_CB (skb).portid); + + buf =kasprintf (GFP_ATOMIC ,"%.*s:%u" , +nla_len (nla[NFTA_OBJ_TABLE ]), + (char *)nla_data (nla[NFTA_OBJ_TABLE ]), + nft_net->base_seq); +audit_log_nfcfg (buf, info->nfmsg->nfgen_family,1 , +AUDIT_NFT_OP_OBJ_RESET ,GFP_ATOMIC ); +kfree (buf); +return nfnetlink_unicast (skb2, net,NETLINK_CB (skb).portid); err_fill_obj_info:
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 7/8 netfilter: nf_tables: Introduce nf_tables_getobj_single
In reply to Pablo Neira AyusoFrom: Phil Sutter <[email protected]>
Outsource the reply skb preparation for non-dump getrule requests into a distinct function. Prep work for object reset locking.
--- net/netfilter/nf_tables_api.c | 75 ++++++++++++++++++++--------------- 1 file changed, 44 insertions(+), 31 deletions(-)
net/netfilter/nf_tables_api.c +44 -31
@@ -8052,10 +8052,10 @@ static int nf_tables_dump_obj_done(struct netlink_callback *cb) }/* called with rcu_read_lock held */ -static int nf_tables_getobj (struct sk_buff *skb,const struct nfnl_info *info, -const struct nlattr *const nla[]) +static struct sk_buff * +nf_tables_getobj_single (u32 portid,const struct nfnl_info *info, +const struct nlattr *const nla[],bool reset) { -const struct nftables_pernet *nft_net =nft_pernet (info->net);struct netlink_ext_ack *extack = info->extack;u8 genmask =nft_genmask_cur (info->net);u8 family = info->nfmsg->nfgen_family;
@@ -8063,52 +8063,69 @@ static int nf_tables_getobj(struct sk_buff *skb, const struct nfnl_info *info,struct net *net = info->net;struct nft_object *obj;struct sk_buff *skb2; -bool reset = false;u32 objtype; -char *buf;int err; -if (info->nlh->nlmsg_flags &NLM_F_DUMP ) { -struct netlink_dump_control c = { - .start = nf_tables_dump_obj_start, - .dump = nf_tables_dump_obj, - .done = nf_tables_dump_obj_done, - .module =THIS_MODULE , - .data = (void *)nla, - }; - -return nft_netlink_dump_start_rcu (info->sk, skb, info->nlh, &c); - } -if (!nla[NFTA_OBJ_NAME ] || !nla[NFTA_OBJ_TYPE ]) -return -EINVAL ; +return ERR_PTR (-EINVAL ); table =nft_table_lookup (net, nla[NFTA_OBJ_TABLE ], family, genmask,0 );if (IS_ERR (table)) {NL_SET_BAD_ATTR (extack, nla[NFTA_OBJ_TABLE ]); -return PTR_ERR (table); +return ERR_CAST (table); } objtype =ntohl (nla_get_be32 (nla[NFTA_OBJ_TYPE ])); obj =nft_obj_lookup (net, table, nla[NFTA_OBJ_NAME ], objtype, genmask);if (IS_ERR (obj)) {NL_SET_BAD_ATTR (extack, nla[NFTA_OBJ_NAME ]); -return PTR_ERR (obj); +return ERR_CAST (obj); } skb2 =alloc_skb (NLMSG_GOODSIZE ,GFP_ATOMIC );if (!skb2) -return -ENOMEM ; +return ERR_PTR (-ENOMEM ); + + err =nf_tables_fill_obj_info (skb2, net, portid, + info->nlh->nlmsg_seq,NFT_MSG_NEWOBJ ,0 , + family, table, obj, reset); +if (err <0 ) { +kfree_skb (skb2); +return ERR_PTR (err); + } + +return skb2; +} + +static int nf_tables_getobj (struct sk_buff *skb,const struct nfnl_info *info, +const struct nlattr *const nla[]) +{ +struct nftables_pernet *nft_net =nft_pernet (info->net); +u32 portid =NETLINK_CB (skb).portid; +struct net *net = info->net; +struct sk_buff *skb2; +bool reset = false; +char *buf; + +if (info->nlh->nlmsg_flags &NLM_F_DUMP ) { +struct netlink_dump_control c = { + .start = nf_tables_dump_obj_start, + .dump = nf_tables_dump_obj, + .done = nf_tables_dump_obj_done, + .module =THIS_MODULE , + .data = (void *)nla, + }; + +return nft_netlink_dump_start_rcu (info->sk, skb, info->nlh, &c); + }if (NFNL_MSG_TYPE (info->nlh->nlmsg_type) ==NFT_MSG_GETOBJ_RESET ) reset = true; - err =nf_tables_fill_obj_info (skb2, net,NETLINK_CB (skb).portid, - info->nlh->nlmsg_seq,NFT_MSG_NEWOBJ ,0 , - family, table, obj, reset); -if (err <0 ) - goto err_fill_obj_info; + skb2 =nf_tables_getobj_single (portid, info, nla, reset); +if (IS_ERR (skb2)) +return PTR_ERR (skb2);if (!reset)return nfnetlink_unicast (skb2, net,NETLINK_CB (skb).portid);
@@ -8121,11 +8138,7 @@ static int nf_tables_getobj(struct sk_buff *skb, const struct nfnl_info *info, AUDIT_NFT_OP_OBJ_RESET, GFP_ATOMIC);kfree (buf); -return nfnetlink_unicast (skb2, net,NETLINK_CB (skb).portid); - -err_fill_obj_info: -kfree_skb (skb2); -return err; +return nfnetlink_unicast (skb2, net, portid); }static void nft_obj_destroy (const struct nft_ctx *ctx,struct nft_object *obj)
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 8/8 netfilter: nf_tables: Add locking for NFT_MSG_GETOBJ_RESET requests
In reply to Pablo Neira AyusoFrom: Phil Sutter <[email protected]>
Objects' dump callbacks are not concurrency-safe per-se with reset bit set. If two CPUs perform a reset at the same time, at least counter and quota objects suffer from value underrun.
Prevent this by introducing dedicated locking callbacks for nfnetlink and the asynchronous dump handling to serialize access.
--- net/netfilter/nf_tables_api.c | 72 ++++++++++++++++++++++++++++------- 1 file changed, 59 insertions(+), 13 deletions(-)
net/netfilter/nf_tables_api.c +59 -13
@@ -8020,6 +8020,19 @@ static int nf_tables_dump_obj(struct sk_buff *skb, struct netlink_callback *cb)return skb->len; } +static int nf_tables_dumpreset_obj (struct sk_buff *skb, +struct netlink_callback *cb) +{ +struct nftables_pernet *nft_net =nft_pernet (sock_net (skb->sk)); +int ret; + +mutex_lock (&nft_net->commit_mutex); + ret =nf_tables_dump_obj (skb, cb); +mutex_unlock (&nft_net->commit_mutex); + +return ret; +} +static int nf_tables_dump_obj_start (struct netlink_callback *cb) {struct nft_obj_dump_ctx *ctx = (void *)cb->ctx;
@@ -8036,12 +8049,18 @@ static int nf_tables_dump_obj_start(struct netlink_callback *cb)if (nla[NFTA_OBJ_TYPE ]) ctx->type =ntohl (nla_get_be32 (nla[NFTA_OBJ_TYPE ])); -if (NFNL_MSG_TYPE (cb->nlh->nlmsg_type) ==NFT_MSG_GETOBJ_RESET ) - ctx->reset = true; -return 0 ; } +static int nf_tables_dumpreset_obj_start (struct netlink_callback *cb) +{ +struct nft_obj_dump_ctx *ctx = (void *)cb->ctx; + + ctx->reset = true; + +return nf_tables_dump_obj_start (cb); +} +static int nf_tables_dump_obj_done (struct netlink_callback *cb) {struct nft_obj_dump_ctx *ctx = (void *)cb->ctx;
@@ -8100,18 +8119,43 @@ nf_tables_getobj_single(u32 portid, const struct nfnl_info *info,static int nf_tables_getobj (struct sk_buff *skb,const struct nfnl_info *info,const struct nlattr *const nla[]) +{ +u32 portid =NETLINK_CB (skb).portid; +struct sk_buff *skb2; + +if (info->nlh->nlmsg_flags &NLM_F_DUMP ) { +struct netlink_dump_control c = { + .start = nf_tables_dump_obj_start, + .dump = nf_tables_dump_obj, + .done = nf_tables_dump_obj_done, + .module =THIS_MODULE , + .data = (void *)nla, + }; + +return nft_netlink_dump_start_rcu (info->sk, skb, info->nlh, &c); + } + + skb2 =nf_tables_getobj_single (portid, info, nla, false); +if (IS_ERR (skb2)) +return PTR_ERR (skb2); + +return nfnetlink_unicast (skb2, info->net, portid); +} + +static int nf_tables_getobj_reset (struct sk_buff *skb, +const struct nfnl_info *info, +const struct nlattr *const nla[]) {struct nftables_pernet *nft_net =nft_pernet (info->net);u32 portid =NETLINK_CB (skb).portid;struct net *net = info->net;struct sk_buff *skb2; -bool reset = false;char *buf;if (info->nlh->nlmsg_flags &NLM_F_DUMP ) {struct netlink_dump_control c = { - .start = nf_tables_dump_obj_start, - .dump = nf_tables_dump_obj, + .start = nf_tables_dumpreset_obj_start, + .dump = nf_tables_dumpreset_obj, .done = nf_tables_dump_obj_done, .module =THIS_MODULE , .data = (void *)nla,
@@ -8120,16 +8164,18 @@ static int nf_tables_getobj(struct sk_buff *skb, const struct nfnl_info *info,return nft_netlink_dump_start_rcu (info->sk, skb, info->nlh, &c); } -if (NFNL_MSG_TYPE (info->nlh->nlmsg_type) ==NFT_MSG_GETOBJ_RESET ) - reset = true; +if (!try_module_get (THIS_MODULE )) +return -EINVAL ; +rcu_read_unlock (); +mutex_lock (&nft_net->commit_mutex); + skb2 =nf_tables_getobj_single (portid, info, nla, true); +mutex_unlock (&nft_net->commit_mutex); +rcu_read_lock (); +module_put (THIS_MODULE ); - skb2 =nf_tables_getobj_single (portid, info, nla, reset);if (IS_ERR (skb2))return PTR_ERR (skb2); -if (!reset) -return nfnetlink_unicast (skb2, net,NETLINK_CB (skb).portid); - buf = kasprintf(GFP_ATOMIC, "%.*s:%u", nla_len(nla[NFTA_OBJ_TABLE]), (char *)nla_data(nla[NFTA_OBJ_TABLE]),
@@ -9421,7 +9467,7 @@ static const struct nfnl_callback nf_tables_cb[NFT_MSG_MAX] = { .policy = nft_obj_policy, }, [NFT_MSG_GETOBJ_RESET] = { - .call = nf_tables_getobj, + .call = nf_tables_getobj_reset, .type = NFNL_CB_RCU, .attr_count = NFTA_OBJ_MAX, .policy = nft_obj_policy,
Signature · 1 line
2.30.2