netfilter: nf_tables_offload: check for register data length mismatches
Subsystems (2)
Pablo Neira Ayuso
maintainerPATCH 1/1 netfilter: nf_tables_offload: check for register data length mismatches
Make sure register data length does not mismatch immediate data length, otherwise hit EOPNOTSUPP.
Fixes c9626a2cbdb2 ("netfilter: nf_tables: add hardware offload support")
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- net/netfilter/nft_bitwise.c | 5 +++-- net/netfilter/nft_cmp.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)
net/netfilter/nft_bitwise.c +3 -2
@@ -134,12 +134,13 @@ static int nft_bitwise_offload(struct nft_offload_ctx *ctx, const struct nft_expr *expr) {const struct nft_bitwise *priv =nft_expr_priv (expr); +struct nft_offload_reg *reg = &ctx->regs[priv->dreg];if (memcmp (&priv->xor, &zero,sizeof (priv->xor)) || - priv->sreg != priv->dreg) + priv->sreg != priv->dreg || priv->len != reg->len)return -EOPNOTSUPP ; -memcpy (&ctx->regs[priv->dreg].mask, &priv->mask,sizeof (priv->mask)); +memcpy (®->mask, &priv->mask,sizeof (priv->mask));return 0 ; }
net/netfilter/nft_cmp.c +1 -1
@@ -116,7 +116,7 @@ static int __nft_cmp_offload(struct nft_offload_ctx *ctx,u8 *mask = (u8 *)&flow->match.mask;u8 *key = (u8 *)&flow->match.key; -if (priv->op !=NFT_CMP_EQ ) +if (priv->op !=NFT_CMP_EQ || reg->len != priv->len)return -EOPNOTSUPP ;memcpy (key + reg->offset, &priv->data, priv->len);
Signature · 1 line
2.11.0