Skip to contentSkip to conversation

Netfilter fixes for net

PATCH In review Pablo Neira Ayuso 3 participants 12 messages Jan 31, 2020 – Feb 2, 2020

Subsystems (4)
lore
Share & tools
lore

Pablo Neira Ayuso

author maintainer
#0 lore raw

cover Netfilter fixes for net

Hi,

The following patchset contains Netfilter fixes for net:

1) Fix suspicious RCU usage in ipset, from Jozsef Kadlecsik.

2) Use kvcalloc, from Joe Perches.

3) Flush flowtable hardware workqueue after garbage collection run, from Paul Blakey.

4) Missing flowtable hardware workqueue flush from nf_flow_table_free(), also from Paul.

5) Restore NF_FLOW_HW_DEAD in flow_offload_work_del(), from Paul.

6) Flowtable documentation fixes, from Matteo Croce.

You can pull these changes from:

git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git

Thank you.

----------------------------------------------------------------

The following changes since commit 44efc78d0e464ce70b45b165c005f8bedc17952e:

net: mvneta: fix XDP support if sw bm is used as fallback (2020-01-29 13:57:59 +0100)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git HEAD

for you to fetch changes up to 78e06cf430934fc3768c342cbebdd1013dcd6fa7:

netfilter: nf_flowtable: fix documentation (2020-01-31 19:31:42 +0100)

----------------------------------------------------------------
Joe Perches (1):
netfilter: Use kvcalloc

Kadlecsik József (1):
netfilter: ipset: fix suspicious RCU usage in find_set_and_id

Matteo Croce (1):
netfilter: nf_flowtable: fix documentation

Paul Blakey (3):
netfilter: flowtable: Fix hardware flush order on nf_flow_table_cleanup
netfilter: flowtable: Fix missing flush hardware on table free
netfilter: flowtable: Fix setting forgotten NF_FLOW_HW_DEAD flag

 Documentation/networking/nf_flowtable.txt |  2 +-
 net/netfilter/ipset/ip_set_core.c         | 41 ++++++++++++++++---------------
 net/netfilter/nf_conntrack_core.c         |  3 +--
 net/netfilter/nf_flow_table_core.c        |  3 ++-
 net/netfilter/nf_flow_table_offload.c     |  1 +
 net/netfilter/x_tables.c                  |  4 +--
 6 files changed, 28 insertions(+), 26 deletions(-)
author maintainer
#1 lore raw

PATCH 1/6 netfilter: ipset: fix suspicious RCU usage in find_set_and_id

From: Kadlecsik József <[email protected]>

find_set_and_id() is called when the NFNL_SUBSYS_IPSET mutex is held. However, in the error path there can be a follow-up recvmsg() without the mutex held. Use the start() function of struct netlink_dump_control instead of dump() to verify and report if the specified set does not exist.

Thanks to Pablo Neira Ayuso for helping me to understand the subleties of the netlink protocol.

---
 net/netfilter/ipset/ip_set_core.c | 41 ++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 20 deletions(-)
net/netfilter/ipset/ip_set_core.c +21 -20
index cf895bc80871..69c107f9ba8d 100644
@@ -1483,31 +1483,34 @@ ip_set_dump_policy[IPSET_ATTR_CMD_MAX + 1] = {
 };
 
 static int
-dump_init(struct netlink_callback *cb, struct ip_set_net *inst)
+ip_set_dump_start(struct netlink_callback *cb)
 {
 	struct nlmsghdr *nlh = nlmsg_hdr(cb->skb);
 	int min_len = nlmsg_total_size(sizeof(struct nfgenmsg));
 	struct nlattr *cda[IPSET_ATTR_CMD_MAX + 1];
 	struct nlattr *attr = (void *)nlh + min_len;
+	struct sk_buff *skb = cb->skb;
+	struct ip_set_net *inst = ip_set_pernet(sock_net(skb->sk));
 	u32 dump_type;
-	ip_set_id_t index;
 	int ret;
 
 	ret = nla_parse(cda, IPSET_ATTR_CMD_MAX, attr,
 			nlh->nlmsg_len - min_len,
 			ip_set_dump_policy, NULL);
 	if (ret)
-		return ret;
+		goto error;
 
 	cb->args[IPSET_CB_PROTO] = nla_get_u8(cda[IPSET_ATTR_PROTOCOL]);
 	if (cda[IPSET_ATTR_SETNAME]) {
+		ip_set_id_t index;
 		struct ip_set *set;
 
 		set = find_set_and_id(inst, nla_data(cda[IPSET_ATTR_SETNAME]),
 				      &index);
-		if (!set)
-			return -ENOENT;
-
+		if (!set) {
+			ret = -ENOENT;
+			goto error;
+		}
 		dump_type = DUMP_ONE;
 		cb->args[IPSET_CB_INDEX] = index;
 	} else {
@@ -1523,10 +1526,17 @@ dump_init(struct netlink_callback *cb, struct ip_set_net *inst)
 	cb->args[IPSET_CB_DUMP] = dump_type;
 
 	return 0;
+
+error:
+	/* We have to create and send the error message manually :-( */
+	if (nlh->nlmsg_flags & NLM_F_ACK) {
+		netlink_ack(cb->skb, nlh, ret, NULL);
+	}
+	return ret;
 }
 
 static int
-ip_set_dump_start(struct sk_buff *skb, struct netlink_callback *cb)
+ip_set_dump_do(struct sk_buff *skb, struct netlink_callback *cb)
 {
 	ip_set_id_t index = IPSET_INVALID_ID, max;
 	struct ip_set *set = NULL;
@@ -1537,18 +1547,8 @@ ip_set_dump_start(struct sk_buff *skb, struct netlink_callback *cb)
 	bool is_destroyed;
 	int ret = 0;
 
-	if (!cb->args[IPSET_CB_DUMP]) {
-		ret = dump_init(cb, inst);
-		if (ret < 0) {
-			nlh = nlmsg_hdr(cb->skb);
-			/* We have to create and send the error message
-			 * manually :-(
-			 */
-			if (nlh->nlmsg_flags & NLM_F_ACK)
-				netlink_ack(cb->skb, nlh, ret, NULL);
-			return ret;
-		}
-	}
+	if (!cb->args[IPSET_CB_DUMP])
+		return -EINVAL;
 
 	if (cb->args[IPSET_CB_INDEX] >= inst->ip_set_max)
 		goto out;
@@ -1684,7 +1684,8 @@ static int ip_set_dump(struct net *net, struct sock *ctnl, struct sk_buff *skb,
 
 	{
 		struct netlink_dump_control c = {
-			.dump = ip_set_dump_start,
+			.start = ip_set_dump_start,
+			.dump = ip_set_dump_do,
 			.done = ip_set_dump_done,
 		};
 		return netlink_dump_start(ctnl, skb, nlh, &c);
Signature · 1 line
2.11.0
maintainer
#2 lore raw

Re: [PATCH 1/6] netfilter: ipset: fix suspicious RCU usage in find_set_and_id

Quoted 8 lines · Pablo Neira Ayuso

From: Kadlecsik József <[email protected]>

find_set_and_id() is called when the NFNL_SUBSYS_IPSET mutex is held. However, in the error path there can be a follow-up recvmsg() without the mutex held. Use the start() function of struct netlink_dump_control instead of dump() to verify and report if the specified set does not exist.

Quoted 6 lines

Thanks to Pablo Neira Ayuso for helping me to understand the subleties of the netlink protocol.

This will trigger a missing signed-off-by check:

Commit 5038517119d5 ("netfilter: ipset: fix suspicious RCU usage in find_set_and_id")
author Signed-off-by missing
author email: [email protected]
committer email: [email protected]

Problem is that the name differs by 'o' vs 'ó' (József Kadlecsik).

I wonder if it's worth getting rid of diacritics for the comparison..

maintainer
#3 lore raw

Re: [PATCH 1/6] netfilter: ipset: fix suspicious RCU usage in find_set_and_id

Quoted 22 lines · Jakub Kicinski
Quoted 8 lines · Pablo Neira Ayuso

From: Kadlecsik József <[email protected]>

find_set_and_id() is called when the NFNL_SUBSYS_IPSET mutex is held. However, in the error path there can be a follow-up recvmsg() without the mutex held. Use the start() function of struct netlink_dump_control instead of dump() to verify and report if the specified set does not exist.

Quoted 6 lines

Thanks to Pablo Neira Ayuso for helping me to understand the subleties of the netlink protocol.

This will trigger a missing signed-off-by check:

Commit 5038517119d5 ("netfilter: ipset: fix suspicious RCU usage in find_set_and_id")
author Signed-off-by missing
author email: [email protected]
committer email: [email protected]

Quoted 6 lines

Problem is that the name differs by 'o' vs 'ó' (József Kadlecsik).

I wonder if it's worth getting rid of diacritics for the comparison..

Mm.. also the name and surname are the other way around :S

#4 lore raw

Re: [PATCH 1/6] netfilter: ipset: fix suspicious RCU usage in find_set_and_id

Quoted 26 lines · Jakub Kicinski
Quoted 25 lines · Jakub Kicinski
Quoted 8 lines · Pablo Neira Ayuso

From: Kadlecsik József <[email protected]>

find_set_and_id() is called when the NFNL_SUBSYS_IPSET mutex is held. However, in the error path there can be a follow-up recvmsg() without the mutex held. Use the start() function of struct netlink_dump_control instead of dump() to verify and report if the specified set does not exist.

Quoted 6 lines

Thanks to Pablo Neira Ayuso for helping me to understand the subleties of the netlink protocol.

This will trigger a missing signed-off-by check:

Commit 5038517119d5 ("netfilter: ipset: fix suspicious RCU usage in find_set_and_id")
author Signed-off-by missing
author email: [email protected]
committer email: [email protected]

Quoted 5 lines
Quoted 3 lines

Problem is that the name differs by 'o' vs 'ó' (József Kadlecsik).

I wonder if it's worth getting rid of diacritics for the comparison..

Mm.. also the name and surname are the other way around :S

Oh, my... Hungarian names... :-) But I also should set my sender email address to [email protected].

What's the best approach for this patch? Shall I resend it?

Best regards,
Jozsef
-
E-mail : [email protected], [email protected] PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt
Address : Wigner Research Centre for Physics

          H-1525 Budapest 114, POB. 49, Hungary
maintainer
#5 lore raw

Re: [PATCH 1/6] netfilter: ipset: fix suspicious RCU usage in find_set_and_id

Quoted 29 lines · Jozsef Kadlecsik
Quoted 28 lines · Jakub Kicinski
Quoted 27 lines · Jakub Kicinski
Quoted 8 lines · Pablo Neira Ayuso

From: Kadlecsik József <[email protected]>

find_set_and_id() is called when the NFNL_SUBSYS_IPSET mutex is held. However, in the error path there can be a follow-up recvmsg() without the mutex held. Use the start() function of struct netlink_dump_control instead of dump() to verify and report if the specified set does not exist.

Quoted 6 lines

Thanks to Pablo Neira Ayuso for helping me to understand the subleties of the netlink protocol.

This will trigger a missing signed-off-by check:

Commit 5038517119d5 ("netfilter: ipset: fix suspicious RCU usage in find_set_and_id")
author Signed-off-by missing
author email: [email protected]
committer email: [email protected]

Problem is that the name differs by 'o' vs 'ó' (József Kadlecsik).

Quoted 8 lines
Quoted 3 lines
Quoted 1 line

I wonder if it's worth getting rid of diacritics for the comparison..

Mm.. also the name and surname are the other way around :S

Oh, my... Hungarian names... :-) But I also should set my sender email address to [email protected].

What's the best approach for this patch? Shall I resend it?

This one is in David Miller's tree already so too late, just fix up your setup going forward please.

To a fellow Central European Jozsef Kadlecsik and Kadlecsik József are more than interchangeable, but probably not worth teaching the validation scripts about this.

author maintainer
#6 lore raw

PATCH 2/6 netfilter: Use kvcalloc

In reply to Pablo Neira Ayuso

From: Joe Perches <[email protected]>

Convert the uses of kvmalloc_array with __GFP_ZERO to the equivalent kvcalloc.

---
 net/netfilter/nf_conntrack_core.c | 3 +--
 net/netfilter/x_tables.c          | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)
net/netfilter/nf_conntrack_core.c +1 -2
index f4c4b467c87e..d1305423640f 100644
@@ -2248,8 +2248,7 @@ void *nf_ct_alloc_hashtable(unsigned int *sizep, int nulls)
 	BUILD_BUG_ON(sizeof(struct hlist_nulls_head) != sizeof(struct hlist_head));
 	nr_slots = *sizep = roundup(*sizep, PAGE_SIZE / sizeof(struct hlist_nulls_head));
 
-	hash = kvmalloc_array(nr_slots, sizeof(struct hlist_nulls_head),
-			      GFP_KERNEL | __GFP_ZERO);
+	hash = kvcalloc(nr_slots, sizeof(struct hlist_nulls_head), GFP_KERNEL);
 
 	if (hash && nulls)
 		for (i = 0; i < nr_slots; i++)
net/netfilter/x_tables.c +2 -2
index ce70c2576bb2..e27c6c5ba9df 100644
@@ -939,14 +939,14 @@ EXPORT_SYMBOL(xt_check_entry_offsets);
  *
  * @size: number of entries
  *
- * Return: NULL or kmalloc'd or vmalloc'd array
+ * Return: NULL or zeroed kmalloc'd or vmalloc'd array
  */
 unsigned int *xt_alloc_entry_offsets(unsigned int size)
 {
 	if (size > XT_MAX_TABLE_SIZE / sizeof(unsigned int))
 		return NULL;
 
-	return kvmalloc_array(size, sizeof(unsigned int), GFP_KERNEL | __GFP_ZERO);
+	return kvcalloc(size, sizeof(unsigned int), GFP_KERNEL);
 
 }
 EXPORT_SYMBOL(xt_alloc_entry_offsets);
Signature · 1 line
2.11.0
author maintainer
#7 lore raw

PATCH 3/6 netfilter: flowtable: Fix hardware flush order on nf_flow_table_cleanup

In reply to Pablo Neira Ayuso

From: Paul Blakey <[email protected]>

On netdev down event, nf_flow_table_cleanup() is called for the relevant device and it cleans all the tables that are on that device. If one of those tables has hardware offload flag, nf_flow_table_iterate_cleanup flushes hardware and then runs the gc. But the gc can queue more hardware work, which will take time to execute.

Instead first add the work, then flush it, to execute it now.

Fixes c29f74e0df7a ("netfilter: nf_flow_table: hardware offload support")
---
 net/netfilter/nf_flow_table_core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nf_flow_table_core.c +1 -1
index 7e91989a1b55..14a069c72bb2 100644
@@ -529,9 +529,9 @@ static void nf_flow_table_do_cleanup(struct flow_offload *flow, void *data)
 static void nf_flow_table_iterate_cleanup(struct nf_flowtable *flowtable,
 					  struct net_device *dev)
 {
-	nf_flow_table_offload_flush(flowtable);
 	nf_flow_table_iterate(flowtable, nf_flow_table_do_cleanup, dev);
 	flush_delayed_work(&flowtable->gc_work);
+	nf_flow_table_offload_flush(flowtable);
 }
 
 void nf_flow_table_cleanup(struct net_device *dev)
Signature · 1 line
2.11.0
author maintainer
#8 lore raw

PATCH 4/6 netfilter: flowtable: Fix missing flush hardware on table free

In reply to Pablo Neira Ayuso

From: Paul Blakey <[email protected]>

If entries exist when freeing a hardware offload enabled table, we queue work for hardware while running the gc iteration.

Execute it (flush) after queueing.

Fixes c29f74e0df7a ("netfilter: nf_flow_table: hardware offload support")
---
 net/netfilter/nf_flow_table_core.c | 1 +
 1 file changed, 1 insertion(+)
net/netfilter/nf_flow_table_core.c +1 -0
index 14a069c72bb2..8af28e10b4e6 100644
@@ -553,6 +553,7 @@ void nf_flow_table_free(struct nf_flowtable *flow_table)
 	cancel_delayed_work_sync(&flow_table->gc_work);
 	nf_flow_table_iterate(flow_table, nf_flow_table_do_cleanup, NULL);
 	nf_flow_table_iterate(flow_table, nf_flow_offload_gc_step, flow_table);
+	nf_flow_table_offload_flush(flow_table);
 	rhashtable_destroy(&flow_table->rhashtable);
 }
 EXPORT_SYMBOL_GPL(nf_flow_table_free);
Signature · 1 line
2.11.0
author maintainer
#9 lore raw

PATCH 5/6 netfilter: flowtable: Fix setting forgotten NF_FLOW_HW_DEAD flag

In reply to Pablo Neira Ayuso

From: Paul Blakey <[email protected]>

During the refactor this was accidently removed.

Fixes ae29045018c8 ("netfilter: flowtable: add nf_flow_offload_tuple() helper")
---
 net/netfilter/nf_flow_table_offload.c | 1 +
 1 file changed, 1 insertion(+)
net/netfilter/nf_flow_table_offload.c +1 -0
index c8b70ffeef0c..83e1db37c3b0 100644
@@ -675,6 +675,7 @@ static void flow_offload_work_del(struct flow_offload_work *offload)
 {
 	flow_offload_tuple_del(offload, FLOW_OFFLOAD_DIR_ORIGINAL);
 	flow_offload_tuple_del(offload, FLOW_OFFLOAD_DIR_REPLY);
+	set_bit(NF_FLOW_HW_DEAD, &offload->flow->flags);
 }
 
 static void flow_offload_tuple_stats(struct flow_offload_work *offload,
Signature · 1 line
2.11.0
author maintainer
#10 lore raw

PATCH 6/6 netfilter: nf_flowtable: fix documentation

In reply to Pablo Neira Ayuso

From: Matteo Croce <[email protected]>

In the flowtable documentation there is a missing semicolon, the command as is would give this error:

    nftables.conf:5:27-33: Error: syntax error, unexpected devices, expecting newline or semicolon
                    hook ingress priority 0 devices = { br0, pppoe-data };
                                            ^^^^^^^
    nftables.conf:4:12-13: Error: invalid hook (null)
            flowtable ft {
                      ^^
Fixes 19b351f16fd9 ("netfilter: add flowtable documentation")
---
 Documentation/networking/nf_flowtable.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/networking/nf_flowtable.txt +1 -1
index ca2136c76042..0bf32d1121be 100644
@@ -76,7 +76,7 @@ flowtable and add one rule to your forward chain.
 
         table inet x {
 		flowtable f {
-			hook ingress priority 0 devices = { eth0, eth1 };
+			hook ingress priority 0; devices = { eth0, eth1 };
 		}
                 chain y {
                         type filter hook forward priority 0; policy accept;
Signature · 1 line
2.11.0
maintainer
#11 lore raw
In reply to Pablo Neira Ayuso
Quoted 11 lines · Pablo Neira Ayuso

Hi,

The following patchset contains Netfilter fixes for net:

1) Fix suspicious RCU usage in ipset, from Jozsef Kadlecsik.

2) Use kvcalloc, from Joe Perches.

3) Flush flowtable hardware workqueue after garbage collection run, from Paul Blakey.

Quoted 6 lines

4) Missing flowtable hardware workqueue flush from nf_flow_table_free(), also from Paul.

5) Restore NF_FLOW_HW_DEAD in flow_offload_work_del(), from Paul.

6) Flowtable documentation fixes, from Matteo Croce.

Pulled, thanks!