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 426E630C345; Tue, 31 Mar 2026 16:26:45 +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=1774974405; cv=none; b=thLtF4jixqix4aqYxj0B0ToRvpLykLJ8kgh27cvsIl6TpAh//Y8QollgYEzicLM3WK1+o40hZ05kNBftVRk4TTgHQe4dCNDRrka/WU4UYDueX08gpaFeLuAKsNWPI7OH0LwJ/4P54acog8v7c/X5B+Y9TMlDIumCyP6I6JqYF5M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774974405; c=relaxed/simple; bh=wXZGPCuyhMns6fz0f07pcuAdaw6+ocvZ1l/bkefynG4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pswDfg3NByqnEzinM/s/rr7JHUrbi/rgvyNFzF+s1bNTa+RTlJ0c1mmionR3lKtWFclszvyCrh48+hRbU4vaWEusPSEv3CliK4wRQqcntG/lwH6eDKg72KBeEjG2c+d8i22bwIdy3aLCnfQoGUZAFkfonkjSBBhTQTCVqA6tOxM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=2GS9S+NP; 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="2GS9S+NP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CBE20C19423; Tue, 31 Mar 2026 16:26:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1774974405; bh=wXZGPCuyhMns6fz0f07pcuAdaw6+ocvZ1l/bkefynG4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2GS9S+NPT9gWelcPb0gkQzXvkqt8m39mWBBrry9iAgXMFOmoOaM83jzf++8kUZhC1 X+G/ayatRHBbzrUzO4Nz5fLg5XSSTD9QnDSCxUAXlK4SUqI/rdWDQ7pAtgOdVa35zp r6BhbYAu12qU5qf5W155jLMRfLJQi9zmFkAHi8/s= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Florian Westphal , Pablo Neira Ayuso , Sasha Levin Subject: [PATCH 6.6 071/175] netfilter: nf_conntrack_expect: skip expectations in other netns via proc Date: Tue, 31 Mar 2026 18:20:55 +0200 Message-ID: <20260331161732.388214476@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260331161729.779738837@linuxfoundation.org> References: <20260331161729.779738837@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.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Pablo Neira Ayuso [ Upstream commit 3db5647984de03d9cae0dcddb509b058351f0ee4 ] Skip expectations that do not reside in this netns. Similar to e77e6ff502ea ("netfilter: conntrack: do not dump other netns's conntrack entries via proc"). Fixes: 9b03f38d0487 ("netfilter: netns nf_conntrack: per-netns expectations") Signed-off-by: Florian Westphal Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- net/netfilter/nf_conntrack_expect.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/netfilter/nf_conntrack_expect.c b/net/netfilter/nf_conntrack_expect.c index 81ca348915c98..7bc64eb89bac4 100644 --- a/net/netfilter/nf_conntrack_expect.c +++ b/net/netfilter/nf_conntrack_expect.c @@ -627,11 +627,15 @@ static int exp_seq_show(struct seq_file *s, void *v) { struct nf_conntrack_expect *expect; struct nf_conntrack_helper *helper; + struct net *net = seq_file_net(s); struct hlist_node *n = v; char *delim = ""; expect = hlist_entry(n, struct nf_conntrack_expect, hnode); + if (!net_eq(nf_ct_exp_net(expect), net)) + return 0; + if (expect->timeout.function) seq_printf(s, "%ld ", timer_pending(&expect->timeout) ? (long)(expect->timeout.expires - jiffies)/HZ : 0); -- 2.51.0