redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

netfilter: nft_hash: validate maximum value of u32 netlink hash attribute

Browse source 
Use the function nft_parse_u32_check() to fetch the value and validate
the u32 attribute into the hash len u8 field.

This patch revisits 4da449ae1d ("netfilter: nft_exthdr: Add size check
on u8 nft_exthdr attributes").

Fixes: cb1b69b0b1 ("netfilter: nf_tables: add hash expression")
Signed-off-by: Laura Garcia Liebana <nevola@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Laura Garcia Liebana 2016-11-14 22:33:34 +01:00 committed by Pablo Neira Ayuso
parent 486dcf43da
commit abd66e9f3c
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
net/netfilter/nft_hash.c
View file

@ -53,6 +53,7 @@ static int nft_hash_init(const struct nft_ctx *ctx,
{ {
struct nft_hash *priv = nft_expr_priv(expr); struct nft_hash *priv = nft_expr_priv(expr);
u32 len; u32 len;
int err;
if (!tb[NFTA_HASH_SREG] || if (!tb[NFTA_HASH_SREG] ||
!tb[NFTA_HASH_DREG] || !tb[NFTA_HASH_DREG] ||
@ -67,8 +68,10 @@ static int nft_hash_init(const struct nft_ctx *ctx,
priv->sreg = nft_parse_register(tb[NFTA_HASH_SREG]); priv->sreg = nft_parse_register(tb[NFTA_HASH_SREG]);
priv->dreg = nft_parse_register(tb[NFTA_HASH_DREG]); priv->dreg = nft_parse_register(tb[NFTA_HASH_DREG]);
len = ntohl(nla_get_be32(tb[NFTA_HASH_LEN])); err = nft_parse_u32_check(tb[NFTA_HASH_LEN], U8_MAX, &len);
if (len == 0 || len > U8_MAX) if (err < 0)
return err;
if (len == 0)
return -ERANGE; return -ERANGE;
priv->len = len; priv->len = len;