Skip to contentSkip to conversation

netfilter: nf_tables: fix device name and prefix match in hook lookup

PATCH Superseded Fernando Fernandez Mancera 2 participants 4 messages Aug 18 – Aug 26

Subsystems (2)

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 netfilter: nf_tables: fix device name and prefix match in hook lookup

Currently, a netdev chain or flowtable hooked to a device prefix can be unintentionally deleted or updated by a control-plane request targeting an exact device name or even a shorter one due to the usage of min() to calculate the length to match.

Fix this by making sure an exact device match never matches a prefix and that both the target and the candidate have the same length.

---
 net/netfilter/nf_tables_api.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
net/netfilter/nf_tables_api.c +6 -3
index af357f6c5070..e2b18c4722fc 100644
@@ -1973,7 +1973,7 @@ static int nft_dump_stats(struct sk_buff *skb, struct nft_stats __percpu *stats)
 	return -ENOSPC;
 }
 
-static bool hook_is_prefix(struct nft_hook *hook)
+static bool hook_is_prefix(const struct nft_hook *hook)
 {
 	return strlen(hook->ifname) >= hook->ifnamelen;
 }
@@ -2440,8 +2440,11 @@ static struct nft_hook *nft_hook_list_find(struct list_head *hook_list,
 	struct nft_hook *hook;
 
 	list_for_each_entry(hook, hook_list, list) {
-		if (!strncmp(hook->ifname, this->ifname,
-			     min(hook->ifnamelen, this->ifnamelen))) {
+		if (hook_is_prefix(hook) != hook_is_prefix(this))
+			continue;
+		if (hook->ifnamelen != this->ifnamelen)
+			continue;
+		if (!strncmp(hook->ifname, this->ifname, hook->ifnamelen)) {
 			if (hook->flags & NFT_HOOK_REMOVE)
 				continue;
 
Signature · 1 line
2.55.0
reviewer
#1 lore raw

Hi Fernando,

Quoted 32 lines · Fernando Fernandez Mancera

Currently, a netdev chain or flowtable hooked to a device prefix can be unintentionally deleted or updated by a control-plane request targeting an exact device name or even a shorter one due to the usage of min() to calculate the length to match.

Fix this by making sure an exact device match never matches a prefix and that both the target and the candidate have the same length.

---
 net/netfilter/nf_tables_api.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
net/netfilter/nf_tables_api.c +1 -1
index af357f6c5070..e2b18c4722fc 100644
@@ -1973,7 +1973,7 @@ static int nft_dump_stats(struct sk_buff *skb, struct nft_stats __percpu *stats)
 	return -ENOSPC;
 }
 
-static bool hook_is_prefix(struct nft_hook *hook)
+static bool hook_is_prefix(const struct nft_hook *hook)
 {
 	return strlen(hook->ifname) >= hook->ifnamelen;
 }
@@ -2440,8 +2440,11 @@ static struct nft_hook *nft_hook_list_find(struct list_head *hook_list,
 	struct nft_hook *hook;
 

net/netfilter/nf_tables_api.c static struct nft_hook *nft_hook_list_find(struct list_head *hook_list, · line 2449

Quoted 10 lines
net/netfilter/nf_tables_api.c +5 -2
 	list_for_each_entry(hook, hook_list, list) {
-		if (!strncmp(hook->ifname, this->ifname,
-			     min(hook->ifnamelen, this->ifnamelen))) {
+		if (hook_is_prefix(hook) != hook_is_prefix(this))
+			continue;
+		if (hook->ifnamelen != this->ifnamelen)
+			continue;
+		if (!strncmp(hook->ifname, this->ifname, hook->ifnamelen)) {
 			if (hook->flags & NFT_HOOK_REMOVE)
 				continue;

I think this fix introduces another issue, when adding another prefix to a flowtable/chain which partially matches an existing prefix. E.g., adding "eth*" with "eth0*" present must be rejected since we otherwise end up trying to register a new interface "eth007" to two hooks at the same time.

Maybe we need a "bool exact" flag which turns the min() intoa a max()? (untested ;)

Cheers, Phil

#2 lore raw
Quoted 52 lines · Phil Sutter

Hi Fernando,

Quoted 32 lines · Fernando Fernandez Mancera

Currently, a netdev chain or flowtable hooked to a device prefix can be unintentionally deleted or updated by a control-plane request targeting an exact device name or even a shorter one due to the usage of min() to calculate the length to match.

Fix this by making sure an exact device match never matches a prefix and that both the target and the candidate have the same length.

---
  net/netfilter/nf_tables_api.c | 9 ++++++---
  1 file changed, 6 insertions(+), 3 deletions(-)
net/netfilter/nf_tables_api.c +1 -1
index af357f6c5070..e2b18c4722fc 100644
@@ -1973,7 +1973,7 @@ static int nft_dump_stats(struct sk_buff *skb, struct nft_stats __percpu *stats)
  	return -ENOSPC;
  }
 
-static bool hook_is_prefix(struct nft_hook *hook)
+static bool hook_is_prefix(const struct nft_hook *hook)
  {
  	return strlen(hook->ifname) >= hook->ifnamelen;
  }
@@ -2440,8 +2440,11 @@ static struct nft_hook *nft_hook_list_find(struct list_head *hook_list,
  	struct nft_hook *hook;
 

net/netfilter/nf_tables_api.c static struct nft_hook *nft_hook_list_find(struct list_head *hook_list, · line 2449

Quoted 10 lines
net/netfilter/nf_tables_api.c +5 -2
  	list_for_each_entry(hook, hook_list, list) {
-		if (!strncmp(hook->ifname, this->ifname,
-			     min(hook->ifnamelen, this->ifnamelen))) {
+		if (hook_is_prefix(hook) != hook_is_prefix(this))
+			continue;
+		if (hook->ifnamelen != this->ifnamelen)
+			continue;
+		if (!strncmp(hook->ifname, this->ifname, hook->ifnamelen)) {
  			if (hook->flags & NFT_HOOK_REMOVE)
  				continue;

I think this fix introduces another issue, when adding another prefix to a flowtable/chain which partially matches an existing prefix. E.g., adding "eth*" with "eth0*" present must be rejected since we otherwise end up trying to register a new interface "eth007" to two hooks at the same time.

Quoted 4 lines

Maybe we need a "bool exact" flag which turns the min() intoa a max()? (untested ;)

Cheers, Phil

Hi Phil, you are right here. I sent a v2 2 days ago changing the behavior of delete operation only. What do you think?

https://lore.kernel.org/netfilter-devel/[email protected]/

Thanks, Fernando.

reviewer
#3 lore raw
Quoted 58 lines · Fernando Fernandez Mancera
Quoted 55 lines · Phil Sutter

Hi Fernando,

Quoted 32 lines · Fernando Fernandez Mancera

Currently, a netdev chain or flowtable hooked to a device prefix can be unintentionally deleted or updated by a control-plane request targeting an exact device name or even a shorter one due to the usage of min() to calculate the length to match.

Fix this by making sure an exact device match never matches a prefix and that both the target and the candidate have the same length.

---
  net/netfilter/nf_tables_api.c | 9 ++++++---
  1 file changed, 6 insertions(+), 3 deletions(-)
net/netfilter/nf_tables_api.c +1 -1
index af357f6c5070..e2b18c4722fc 100644
@@ -1973,7 +1973,7 @@ static int nft_dump_stats(struct sk_buff *skb, struct nft_stats __percpu *stats)
  	return -ENOSPC;
  }
 
-static bool hook_is_prefix(struct nft_hook *hook)
+static bool hook_is_prefix(const struct nft_hook *hook)
  {
  	return strlen(hook->ifname) >= hook->ifnamelen;
  }
@@ -2440,8 +2440,11 @@ static struct nft_hook *nft_hook_list_find(struct list_head *hook_list,
  	struct nft_hook *hook;
 

net/netfilter/nf_tables_api.c static struct nft_hook *nft_hook_list_find(struct list_head *hook_list, · line 2449

Quoted 10 lines
net/netfilter/nf_tables_api.c +5 -2
  	list_for_each_entry(hook, hook_list, list) {
-		if (!strncmp(hook->ifname, this->ifname,
-			     min(hook->ifnamelen, this->ifnamelen))) {
+		if (hook_is_prefix(hook) != hook_is_prefix(this))
+			continue;
+		if (hook->ifnamelen != this->ifnamelen)
+			continue;
+		if (!strncmp(hook->ifname, this->ifname, hook->ifnamelen)) {
  			if (hook->flags & NFT_HOOK_REMOVE)
  				continue;

I think this fix introduces another issue, when adding another prefix to a flowtable/chain which partially matches an existing prefix. E.g., adding "eth*" with "eth0*" present must be rejected since we otherwise end up trying to register a new interface "eth007" to two hooks at the same time.

Maybe we need a "bool exact" flag which turns the min() intoa a max()? (untested ;)

Quoted 6 lines
Quoted 1 line

Cheers, Phil

Hi Phil, you are right here. I sent a v2 2 days ago changing the behavior of delete operation only. What do you think?

https://lore.kernel.org/netfilter-devel/[email protected]/

Oh I see, thanks for the pointer. Let's meet over there. :)

Cheers, Phil