From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 03FF63AEF45; Wed, 8 Apr 2026 18:14:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775672044; cv=none; b=kJrwsnOdcpiGId8z2VFDA1YMscHHsVvg9o/FQubglItLLYiESxRf9Ot5nuhIojmx63pJqvNpeheBhhpthNxbkz7g5hREA38WZH8xEWcxB8pZY3tmJ7pCJEUAct9bgCPn7jkG+2/SNddHyF0eorMrKoKysZsiv4f8kAQPClWjfPA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775672044; c=relaxed/simple; bh=E2Xhq0lMt8+kSjjbwdGhp/Ypp4+f/f3fi9dm+gwMj3E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FQn6zvnETFlNTx9ZsmZ4vCPrsV/7vdmK0CHmuso/BzWkYKqVWNvjm8NAe1UAGopuyLLg3UscuYCPyYPJ+/I5qvpd2QcUhuydkDEg4W/hA/5d0073wM6wHAOIxhnW3g6lO62RN7ycZ5tgAWyfmHHsGXvafqEe2RZsWc6AoL0udns= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=aYeL9cBq; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="aYeL9cBq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8E59FC19425; Wed, 8 Apr 2026 18:14:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1775672043; bh=E2Xhq0lMt8+kSjjbwdGhp/Ypp4+f/f3fi9dm+gwMj3E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aYeL9cBqnaduS1Mng5F+F0d8ngcPerh3czAl95+cQVvcrlo3kNszZWWBwQA3CGscq incFWOpPH9i4/7g/IPRTncYghe1DNERLrlMehoXIVBkiBXpAzIyzraSkpMUX816ZRh /thzEOKeo8Xe9W/MwxS6febvldZqOMU/WuqtTaJ4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, kernel test robot , Qi Tang , Pablo Neira Ayuso , Sasha Levin Subject: [PATCH 6.1 168/312] netfilter: ctnetlink: zero expect NAT fields when CTA_EXPECT_NAT absent Date: Wed, 8 Apr 2026 20:01:25 +0200 Message-ID: <20260408175940.039909563@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260408175933.715315542@linuxfoundation.org> References: <20260408175933.715315542@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Qi Tang [ Upstream commit 35177c6877134a21315f37d57a5577846225623e ] ctnetlink_alloc_expect() allocates expectations from a non-zeroing slab cache via nf_ct_expect_alloc(). When CTA_EXPECT_NAT is not present in the netlink message, saved_addr and saved_proto are never initialized. Stale data from a previous slab occupant can then be dumped to userspace by ctnetlink_exp_dump_expect(), which checks these fields to decide whether to emit CTA_EXPECT_NAT. The safe sibling nf_ct_expect_init(), used by the packet path, explicitly zeroes these fields. Zero saved_addr, saved_proto and dir in the else branch, guarded by IS_ENABLED(CONFIG_NF_NAT) since these fields only exist when NAT is enabled. Confirmed by priming the expect slab with NAT-bearing expectations, freeing them, creating a new expectation without CTA_EXPECT_NAT, and observing that the ctnetlink dump emits a spurious CTA_EXPECT_NAT containing stale data from the prior allocation. Fixes: 076a0ca02644 ("netfilter: ctnetlink: add NAT support for expectations") Reported-by: kernel test robot Signed-off-by: Qi Tang Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- net/netfilter/nf_conntrack_netlink.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c index 6190a1d062402..c5480f952f157 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c @@ -3569,6 +3569,12 @@ ctnetlink_alloc_expect(const struct nlattr * const cda[], struct nf_conn *ct, exp, nf_ct_l3num(ct)); if (err < 0) goto err_out; +#if IS_ENABLED(CONFIG_NF_NAT) + } else { + memset(&exp->saved_addr, 0, sizeof(exp->saved_addr)); + memset(&exp->saved_proto, 0, sizeof(exp->saved_proto)); + exp->dir = 0; +#endif } return exp; err_out: -- 2.53.0