Skip to contentSkip to conversation

netfilter: nf_tables: registers should not go over NFT_REG32_NUM

PATCH In review Pablo Neira Ayuso 2 participants 4 messages Mar 17, 2022

Subsystems (2)
lore
Share & tools
lore

Pablo Neira Ayuso

author maintainer
#0 lore raw

PATCH 1/2 netfilter: nf_tables: registers should not go over NFT_REG32_NUM

Bail out in case userspace uses registers over maximum number of register.

Fixes 49499c3e6e18 ("netfilter: nf_tables: switch registers to 32 bit addressing")
---
 net/netfilter/nf_tables_api.c | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)
net/netfilter/nf_tables_api.c +18 -5
index d71a33ae39b3..829ecd310ae6 100644
@@ -9275,17 +9275,24 @@ int nft_parse_u32_check(const struct nlattr *attr, int max, u32 *dest)
 }
 EXPORT_SYMBOL_GPL(nft_parse_u32_check);
 
-static unsigned int nft_parse_register(const struct nlattr *attr)
+static unsigned int nft_parse_register(const struct nlattr *attr, u32 *preg)
 {
 	unsigned int reg;
 
 	reg = ntohl(nla_get_be32(attr));
+	if (reg >= NFT_REG32_NUM)
+		return -ERANGE;
+
 	switch (reg) {
 	case NFT_REG_VERDICT...NFT_REG_4:
-		return reg * NFT_REG_SIZE / NFT_REG32_SIZE;
+		*preg = reg * NFT_REG_SIZE / NFT_REG32_SIZE;
+		break;
 	default:
-		return reg + NFT_REG_SIZE / NFT_REG32_SIZE - NFT_REG32_00;
+		*preg = reg + NFT_REG_SIZE / NFT_REG32_SIZE - NFT_REG32_00;
+		break;
 	}
+
+	return 0;
 }
 
 /**
@@ -9327,7 +9334,10 @@ int nft_parse_register_load(const struct nlattr *attr, u8 *sreg, u32 len)
 	u32 reg;
 	int err;
 
-	reg = nft_parse_register(attr);
+	err = nft_parse_register(attr, &reg);
+	if (err < 0)
+		return err;
+
 	err = nft_validate_register_load(reg, len);
 	if (err < 0)
 		return err;
@@ -9382,7 +9392,10 @@ int nft_parse_register_store(const struct nft_ctx *ctx,
 	int err;
 	u32 reg;
 
-	reg = nft_parse_register(attr);
+	err = nft_parse_register(attr, &reg);
+	if (err < 0)
+		return err;
+
 	err = nft_validate_register_store(ctx, reg, data, type, len);
 	if (err < 0)
 		return err;
Signature · 1 line
2.30.2
author maintainer
#1 lore raw

PATCH 2/2 netfilter: nf_tables: initialize registers in nft_do_chain()

Initialize registers to avoid stack leak into userspace.

Fixes 22fe54d5fefc ("netfilter: nf_tables: add support for dynamic set updates")
---
 net/netfilter/nf_tables_core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nf_tables_core.c +1 -1
index 36e73f9828c5..8af98239655d 100644
@@ -201,7 +201,7 @@ nft_do_chain(struct nft_pktinfo *pkt, void *priv)
 	const struct nft_rule_dp *rule, *last_rule;
 	const struct net *net = nft_net(pkt);
 	const struct nft_expr *expr, *last;
-	struct nft_regs regs;
+	struct nft_regs regs = {};
 	unsigned int stackptr = 0;
 	struct nft_jumpstack jumpstack[NFT_JUMP_STACK_SIZE];
 	bool genbit = READ_ONCE(net->nft.gencursor);
Signature · 1 line
2.30.2
maintainer
#2 lore raw
In reply to Pablo Neira Ayuso
Quoted 15 lines · Pablo Neira Ayuso

Bail out in case userspace uses registers over maximum number of register.

Fixes 49499c3e6e18 ("netfilter: nf_tables: switch registers to 32 bit addressing")
---
 net/netfilter/nf_tables_api.c | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)
net/netfilter/nf_tables_api.c +0 -0
index d71a33ae39b3..829ecd310ae6 100644
@@ -9275,17 +9275,24 @@ int nft_parse_u32_check(const struct nlattr *attr, int max, u32 *dest)
 }
 EXPORT_SYMBOL_GPL(nft_parse_u32_check);

net/netfilter/nf_tables_api.c int nft_parse_u32_check(const struct nlattr *attr, int max, u32 *dest) · line 9285

Quoted 10 lines
net/netfilter/nf_tables_api.c +4 -1
 
-static unsigned int nft_parse_register(const struct nlattr *attr)
+static unsigned int nft_parse_register(const struct nlattr *attr, u32 *preg)
 {
 	unsigned int reg;
 
 	reg = ntohl(nla_get_be32(attr));
+	if (reg >= NFT_REG32_NUM)
+		return -ERANGE;
+

This breaks userspace.

NFT_REG32_00 is 8, so this makes NFT_REG32_13, 14 and 15 invalid.

author maintainer
#3 lore raw
Quoted 22 lines · Florian Westphal
Quoted 21 lines · Pablo Neira Ayuso

Bail out in case userspace uses registers over maximum number of register.

Fixes 49499c3e6e18 ("netfilter: nf_tables: switch registers to 32 bit addressing")
---
 net/netfilter/nf_tables_api.c | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)
net/netfilter/nf_tables_api.c +1 -1
index d71a33ae39b3..829ecd310ae6 100644
@@ -9275,17 +9275,24 @@ int nft_parse_u32_check(const struct nlattr *attr, int max, u32 *dest)
 }
 EXPORT_SYMBOL_GPL(nft_parse_u32_check);
 
-static unsigned int nft_parse_register(const struct nlattr *attr)
+static unsigned int nft_parse_register(const struct nlattr *attr, u32 *preg)
 {
 	unsigned int reg;
 
Quoted 8 lines

net/netfilter/nf_tables_api.c int nft_parse_u32_check(const struct nlattr *attr, int max, u32 *dest) · line 9285

Quoted 4 lines
net/netfilter/nf_tables_api.c +3 -0
 	reg = ntohl(nla_get_be32(attr));
+	if (reg >= NFT_REG32_NUM)
+		return -ERANGE;
+

This breaks userspace.

NFT_REG32_00 is 8, so this makes NFT_REG32_13, 14 and 15 invalid.

Sending v2. Thanks for reviewing