Received: from Chamillionaire.breakpoint.cc (Chamillionaire.breakpoint.cc [91.216.245.30]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 50D944EA379 for ; Tue, 9 Jun 2026 19:14:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.216.245.30 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781032496; cv=none; b=hDDXpeR5Qjk6rSI4Gb6EPwCWsolSy9a7LbaFljBnOAng/S2jPfnECBJAkWFDJ0djGbj5R66YHVgtkRYBMHMXxjOA75yuT8KCGSQf0G8sUU1ELBJRQQX+k65ddreW4ARK36GtkGM9F1ghk0zB4WIHUFTs9sEZyv99q+Mr4RqT6VA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781032496; c=relaxed/simple; bh=dHAKZi6xVvWLow+xJhzncq8jY2kEo/Av82Sj5zUo04E=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=WQp4ADm1Zct10Sfez6MXzhvO8IBLBoLfZwsEqlajo2kjflVOMFFnDKaV7x752UGxnIBAelkO0IjAwlMLuVGA1eSLVH/x2Hn13gOi0eJiWUjJbzyrqXEGmg6DsW0OC+ebI54tN/gAbtqCg8kVOjWchvo6H+gxHQstfwJQ4Xh1lS4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=strlen.de; spf=pass smtp.mailfrom=Chamillionaire.breakpoint.cc; arc=none smtp.client-ip=91.216.245.30 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=strlen.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=Chamillionaire.breakpoint.cc Received: by Chamillionaire.breakpoint.cc (Postfix, from userid 1003) id D4FB360C94; Tue, 09 Jun 2026 21:14:52 +0200 (CEST) From: Florian Westphal To: Subject: [PATCH v2 nf] netfilter: nft_exthdr: fix register tracking for F_PRESENT flag Date: Tue, 9 Jun 2026 21:14:37 +0200 Message-ID: <20260609191447.16376-1-fw@strlen.de> X-Mailer: git-send-email 2.53.0 Precedence: bulk X-Mailing-List: netfilter-devel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Fixes: c078ca3b0c5b ("netfilter: nft_exthdr: Add support for existence check") Signed-off-by: Florian Westphal --- v2: reject rule add instead of silent 'len = 1'. net/netfilter/nft_exthdr.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/netfilter/nft_exthdr.c b/net/netfilter/nft_exthdr.c index e6a07c0df207..b6cca7c947a2 100644 --- a/net/netfilter/nft_exthdr.c +++ b/net/netfilter/nft_exthdr.c @@ -532,6 +532,9 @@ static int nft_exthdr_init(const struct nft_ctx *ctx, return err; } + if ((priv->flags & NFT_EXTHDR_F_PRESENT) && len != 1) + return -EINVAL; + priv->type = nla_get_u8(tb[NFTA_EXTHDR_TYPE]); priv->offset = offset; priv->len = len; -- 2.53.0