Commit 94254f99 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso

netfilter: nft_payload: report ERANGE for too long offset and length

Instead of offset and length are truncation to u8, report ERANGE.

Fixes: 96518518 ("netfilter: add nftables")
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent ab482c6b
...@@ -833,6 +833,7 @@ nft_payload_select_ops(const struct nft_ctx *ctx, ...@@ -833,6 +833,7 @@ nft_payload_select_ops(const struct nft_ctx *ctx,
{ {
enum nft_payload_bases base; enum nft_payload_bases base;
unsigned int offset, len; unsigned int offset, len;
int err;
if (tb[NFTA_PAYLOAD_BASE] == NULL || if (tb[NFTA_PAYLOAD_BASE] == NULL ||
tb[NFTA_PAYLOAD_OFFSET] == NULL || tb[NFTA_PAYLOAD_OFFSET] == NULL ||
...@@ -859,8 +860,13 @@ nft_payload_select_ops(const struct nft_ctx *ctx, ...@@ -859,8 +860,13 @@ nft_payload_select_ops(const struct nft_ctx *ctx,
if (tb[NFTA_PAYLOAD_DREG] == NULL) if (tb[NFTA_PAYLOAD_DREG] == NULL)
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
offset = ntohl(nla_get_be32(tb[NFTA_PAYLOAD_OFFSET])); err = nft_parse_u32_check(tb[NFTA_PAYLOAD_OFFSET], U8_MAX, &offset);
len = ntohl(nla_get_be32(tb[NFTA_PAYLOAD_LEN])); if (err < 0)
return ERR_PTR(err);
err = nft_parse_u32_check(tb[NFTA_PAYLOAD_LEN], U8_MAX, &len);
if (err < 0)
return ERR_PTR(err);
if (len <= 4 && is_power_of_2(len) && IS_ALIGNED(offset, len) && if (len <= 4 && is_power_of_2(len) && IS_ALIGNED(offset, len) &&
base != NFT_PAYLOAD_LL_HEADER && base != NFT_PAYLOAD_INNER_HEADER) base != NFT_PAYLOAD_LL_HEADER && base != NFT_PAYLOAD_INNER_HEADER)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment