netfilter: nft_payload: reject offsets exceeding 65535 bytes
Subsystems (2)
Florian Westphal
maintainerPATCH 1/1 netfilter: nft_payload: reject offsets exceeding 65535 bytes
Large offsets were rejected based on netlink policy, but blamed commit removed the policy without updating nft_payload_inner_init() to use the truncation-check helper.
Silent truncation is not a problem, but not wanted either, so add a check.
Fixes 077dc4a27579 ("netfilter: nft_payload: extend offset to 65535 bytes")
Signed-off-by Florian Westphal <[email protected]>
--- net/netfilter/nft_payload.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
net/netfilter/nft_payload.c +13 -3
@@ -224,11 +224,17 @@ static int nft_payload_init(const struct nft_ctx *ctx, const struct nlattr * const tb[]) {struct nft_payload *priv =nft_expr_priv (expr); +u32 offset; +int err; priv->base =ntohl (nla_get_be32 (tb[NFTA_PAYLOAD_BASE ])); - priv->offset =ntohl (nla_get_be32 (tb[NFTA_PAYLOAD_OFFSET ])); priv->len =ntohl (nla_get_be32 (tb[NFTA_PAYLOAD_LEN ])); + err =nft_parse_u32_check (tb[NFTA_PAYLOAD_OFFSET ],U16_MAX , &offset); +if (err <0 ) +return err; + priv->offset = offset; +return nft_parse_register_store (ctx, tb[NFTA_PAYLOAD_DREG ], &priv->dreg,NULL ,NFT_DATA_VALUE , priv->len);
@@ -621,7 +627,8 @@ static int nft_payload_inner_init(const struct nft_ctx *ctx, const struct nlattr * const tb[]) {struct nft_payload *priv =nft_expr_priv (expr); -u32 base; +u32 base, offset; +int err;if (!tb[NFTA_PAYLOAD_BASE ] || !tb[NFTA_PAYLOAD_OFFSET ] || !tb[NFTA_PAYLOAD_LEN ] || !tb[NFTA_PAYLOAD_DREG ])
@@ -639,8 +646,11 @@ static int nft_payload_inner_init(const struct nft_ctx *ctx, } priv->base = base; - priv->offset =ntohl (nla_get_be32 (tb[NFTA_PAYLOAD_OFFSET ])); priv->len =ntohl (nla_get_be32 (tb[NFTA_PAYLOAD_LEN ])); + err =nft_parse_u32_check (tb[NFTA_PAYLOAD_OFFSET ],U16_MAX , &offset); +if (err <0 ) +return err; + priv->offset = offset; return nft_parse_register_store(ctx, tb[NFTA_PAYLOAD_DREG], &priv->dreg, NULL, NFT_DATA_VALUE,
Signature · 1 line
2.53.0
Quoted 9 lines · Florian Westphal
Large offsets were rejected based on netlink policy, but blamed commit removed the policy without updating
nft_payload_inner_init()to use the truncation-check helper.Silent truncation is not a problem, but not wanted either, so add a check.
Fixes 077dc4a27579 ("netfilter: nft_payload: extend offset to 65535 bytes")Signed-off-by Florian Westphal <[email protected]>
Uh, it seems I missed two other usages of NFTA_PAYLOAD_OFFSET, thanks for catching this.
Reviewed-by Fernando Fernandez Mancera <[email protected]>