netfilter: nf_tables: validate registers coming from userspace.
Subsystems (2)
Pablo Neira Ayuso
maintainerPATCH v2 1/2 netfilter: nf_tables: validate registers coming from userspace.
Bail out in case userspace uses unsupported registers.
---
v2: fix incorrect register sanity check.
net/netfilter/nf_tables_api.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-)
net/netfilter/nf_tables_api.c +17 -5
@@ -9275,17 +9275,23 @@ 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));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 ; + case NFT_REG32_00...NFT_REG32_15: + *preg = reg +NFT_REG_SIZE /NFT_REG32_SIZE -NFT_REG32_00 ; +break ;default : -return reg +NFT_REG_SIZE /NFT_REG32_SIZE -NFT_REG32_00 ; +return -ERANGE ; } + +return 0 ; }/**
@@ -9327,7 +9333,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, ®); +if (err <0 ) +return err; + err =nft_validate_register_load (reg, len);if (err <0 )return err;
@@ -9382,7 +9391,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, ®); +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
Pablo Neira Ayuso
maintainerPATCH v2 2/2 netfilter: nf_tables: initialize registers in nft_do_chain()
Initialize registers to avoid stack leak into userspace.
---
v2: no changes
net/netfilter/nf_tables_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nf_tables_core.c +1 -1
@@ -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
Florian Westphal
maintainerRe: [PATCH nf,v2 2/2] netfilter: nf_tables: initialize registers in nft_do_chain()
Quoted 3 lines · Pablo Neira Ayuso
Initialize registers to avoid stack leak into userspace.
Fixes 22fe54d5fefc ("netfilter: nf_tables: add support for dynamic set updates")
As per David, my assessment was incorrect, this needs to be
... because its possible to exfiltrate via cmp+imm and observe if there is a match (accept/drop/counter, etc).
Patch is correct though, please consider pushing this out with updates fixes tag.
Thanks!
Quoted 6 lines · Pablo Neira Ayuso
Bail out in case userspace uses unsupported registers.
Fixes 49499c3e6e18 ("netfilter: nf_tables: switch registers to 32 bit addressing")Signed-off-by Pablo Neira Ayuso <[email protected]>---
v2: fix incorrect register sanity check.
This is better than the patch I made, thanks!