[PATCH 6.1.y 0/3] netfilter: nf_conntrack_expect: use conntrack GC to reap expectations
From: Miguel Gazquez (Schneider Electric)
Date: Fri Sep 18 2026 - 14:33:59 EST
Backported two other patches, to make this fix apply cleanly.
Signed-off-by: Miguel Gazquez (Schneider Electric) <miguel.gazquez@xxxxxxxxxxx>
---
Pablo Neira Ayuso (3):
netfilter: nf_conntrack_pptp: move GRE specific cleanup to GRE tracker
netfilter: conntrack: check NULL when retrieving ct extension
netfilter: nf_conntrack_expect: use conntrack GC to reap expectations
include/net/netfilter/ipv4/nf_conntrack_ipv4.h | 4 +
include/net/netfilter/nf_conntrack_expect.h | 16 +-
include/net/netfilter/nf_conntrack_helper.h | 2 +
include/uapi/linux/netfilter/nf_conntrack_common.h | 1 +
net/ipv4/netfilter/nf_nat_h323.c | 12 ++
net/ipv4/netfilter/nf_nat_pptp.c | 14 +-
net/netfilter/nf_conntrack_broadcast.c | 3 +
net/netfilter/nf_conntrack_core.c | 33 +++-
net/netfilter/nf_conntrack_expect.c | 174 ++++++++++-----------
net/netfilter/nf_conntrack_ftp.c | 6 +
net/netfilter/nf_conntrack_h323_main.c | 22 ++-
net/netfilter/nf_conntrack_helper.c | 10 +-
net/netfilter/nf_conntrack_netlink.c | 22 ++-
net/netfilter/nf_conntrack_pptp.c | 72 ++-------
net/netfilter/nf_conntrack_proto_gre.c | 71 +++++++++
net/netfilter/nf_conntrack_sane.c | 3 +
net/netfilter/nf_conntrack_seqadj.c | 17 +-
net/netfilter/nf_conntrack_sip.c | 54 +++++--
net/netfilter/nf_nat_sip.c | 12 ++
net/netfilter/nfnetlink_cthelper.c | 6 +
net/netfilter/nft_ct.c | 3 +-
21 files changed, 363 insertions(+), 194 deletions(-)
---
base-commit: 1a8763b93150b2c8f3992c27a5ce7857fee4ab0f
change-id: 20260918-cve-2026-80668-6-1-ae34dea72a3b
Best regards,
--
Miguel Gazquez (Schneider Electric) <miguel.gazquez@xxxxxxxxxxx>