9bfd50e6dc
Use AlmaLinux OS secure boot cert
Enable Btrfs support for all kernel variants
af_unix: set gc_in_progress to true in unix_gc() {CVE-2026-53361}
hpsa: bring back deprecated PCI ids #CFHack #CFHack2024
mptsas: bring back deprecated PCI ids #CFHack #CFHack2024
megaraid_sas: bring back deprecated PCI ids #CFHack #CFHack2024
qla2xxx: bring back deprecated PCI ids #CFHack #CFHack2024
qla4xxx: bring back deprecated PCI ids
be2iscsi: bring back deprecated PCI ids
kernel/rh_messages.h: enable all disabled pci devices by moving to unmaintained
gve: update QPL page registration logic to honor max_registered_pages (backport from upstream)
gve: enable reading max ring size from the device in DQO-QPL mode (backport from upstream)
38 lines
1.6 KiB
Diff
38 lines
1.6 KiB
Diff
From 13e0a1308f7e0d30a339e4d839576bddd419dd69 Mon Sep 17 00:00:00 2001
|
|
From: Pratham Gupta <pratham36gupta@gmail.com>
|
|
Date: Mon, 4 May 2026 22:11:57 -0700
|
|
Subject: [PATCH] netfilter: ctnetlink: use nf_ct_exp_net() in expectation dump
|
|
|
|
commit a7f57320bbbc67e347bf5fff4b4a9bab980d5956 upstream.
|
|
|
|
Commit 02a3231b6d82 ("netfilter: nf_conntrack_expect: store netns and zone in expectation")
|
|
introduced exp->net so RCU-only expectation paths no longer need to
|
|
dereference exp->master for netns lookups.
|
|
|
|
Commit 3db5647984de ("netfilter: nf_conntrack_expect: skip expectations in other netns via proc")
|
|
updated the proc path accordingly, but ctnetlink_exp_dump_table() still
|
|
compares against nf_ct_net(exp->master).
|
|
|
|
Use nf_ct_exp_net(exp) here as well so the netlink dump path matches
|
|
the rest of the March 2026 expectation netns/RCU cleanup.
|
|
|
|
Fixes: 02a3231b6d82 ("netfilter: nf_conntrack_expect: store netns and zone in expectation")
|
|
Cc: stable@vger.kernel.org
|
|
Signed-off-by: Pratham Gupta <pratham36gupta@gmail.com>
|
|
Signed-off-by: Florian Westphal <fw@strlen.de>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
|
|
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
|
|
index caf0506..b375374 100644
|
|
--- a/net/netfilter/nf_conntrack_netlink.c
|
|
+++ b/net/netfilter/nf_conntrack_netlink.c
|
|
@@ -3194,7 +3194,7 @@ ctnetlink_exp_dump_table(struct sk_buff *skb, struct netlink_callback *cb)
|
|
if (l3proto && exp->tuple.src.l3num != l3proto)
|
|
continue;
|
|
|
|
- if (!net_eq(nf_ct_net(exp->master), net))
|
|
+ if (!net_eq(nf_ct_exp_net(exp), net))
|
|
continue;
|
|
|
|
if (cb->args[1]) {
|