netfilter: nft_exthdr: fix register tracking for F_PRESENT flag
Subsystems (2)
Florian Westphal
maintainerPATCH v3 1/1 netfilter: nft_exthdr: fix register tracking for F_PRESENT flag
nft_exthdr_init() passes user-controlled priv->len to nft_parse_register_store(), which marks that many bytes in the register bitmap as initialized. However, when NFT_EXTHDR_F_PRESENT is set, the eval paths write only 1 byte (nft_reg_store8) or 4 bytes (*dest = 0 on TCP/DCCP error path). When len > 4, registers beyond the first are never written, retaining uninitialized stack data from nft_regs.
Bail out if userspace requests too much data when F_PRESENT is set.
Reported-by Ji'an Zhou <[email protected]>
Fixes c078ca3b0c5b ("netfilter: nft_exthdr: Add support for existence check")
Signed-off-by Florian Westphal <[email protected]>
---
v3: Test 'flags', not priv->flags :-|
net/netfilter/nft_exthdr.c | 3 +++ 1 file changed, 3 insertions(+)
net/netfilter/nft_exthdr.c +3 -0
@@ -532,6 +532,9 @@ static int nft_exthdr_init(const struct nft_ctx *ctx,return err; } +if ((flags &NFT_EXTHDR_F_PRESENT ) && len !=1 ) +return -EINVAL ; + priv->type =nla_get_u8 (tb[NFTA_EXTHDR_TYPE ]); priv->offset = offset; priv->len = len;
Signature · 1 line
2.53.0