From 789bf79b318ea8bf5080f8f51909dca0eb388d19 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 22 Jul 2026 09:08:38 -0600 Subject: [PATCH] kernel-7.1.4-204 * Wed Jul 22 2026 Justin M. Forbes [7.1.4-4] - net/packet: avoid fanout hook re-registration after unregister (David Lee) Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- Patchlist.changelog | 3 +++ kernel.changelog | 4 ++++ kernel.spec | 7 +++++-- patch-7.1-redhat.patch | 20 +++++++++++++++++++- sources | 2 +- 6 files changed, 33 insertions(+), 5 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index dbdb99ad3..f8a4a2cb0 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 3 +RHEL_RELEASE = 4 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index bbac3757e..ce9f28824 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,6 @@ +https://gitlab.com/cki-project/kernel-ark/-/commit/4735f2eec63a6a192b69a79921f8559570f1ebf9 + 4735f2eec63a6a192b69a79921f8559570f1ebf9 net/packet: avoid fanout hook re-registration after unregister + https://gitlab.com/cki-project/kernel-ark/-/commit/ce4210e437cef5c58d496117632473f6ad20f1d1 ce4210e437cef5c58d496117632473f6ad20f1d1 net/sched: cls_api: Handle TC_ACT_CONSUMED in tcf_qevent_handle diff --git a/kernel.changelog b/kernel.changelog index 84d686d29..8bbef45d6 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,7 @@ +* Wed Jul 22 2026 Justin M. Forbes [7.1.4-4] +- net/packet: avoid fanout hook re-registration after unregister (David Lee) +Resolves: + * Wed Jul 22 2026 Justin M. Forbes [7.1.4-3] - net/sched: cls_api: Handle TC_ACT_CONSUMED in tcf_qevent_handle (Jamal Hadi Salim) Resolves: diff --git a/kernel.spec b/kernel.spec index 39f3c3e7f..bea7a17f5 100644 --- a/kernel.spec +++ b/kernel.spec @@ -190,13 +190,13 @@ Summary: The Linux kernel %define specrpmversion 7.1.4 %define specversion 7.1.4 %define patchversion 7.1 -%define pkgrelease 203 +%define pkgrelease 204 %define kversion 7 %define tarfile_release 7.1.4 # This is needed to do merge window version magic %define patchlevel 1 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 203%{?buildid}%{?dist} +%define specrelease 204%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 7.1.4 @@ -4857,6 +4857,9 @@ fi\ # # %changelog +* Wed Jul 22 2026 Justin M. Forbes [7.1.4-4] +- net/packet: avoid fanout hook re-registration after unregister (David Lee) + * Wed Jul 22 2026 Justin M. Forbes [7.1.4-3] - net/sched: cls_api: Handle TC_ACT_CONSUMED in tcf_qevent_handle (Jamal Hadi Salim) diff --git a/patch-7.1-redhat.patch b/patch-7.1-redhat.patch index 4ec6e65e8..5d6b3ff77 100644 --- a/patch-7.1-redhat.patch +++ b/patch-7.1-redhat.patch @@ -53,6 +53,7 @@ include/linux/security.h | 9 + kernel/module/signing.c | 9 +- net/can/bcm.c | 37 +- + net/packet/af_packet.c | 6 +- net/sched/cls_api.c | 3 + scripts/Makefile.lib | 3 + scripts/tags.sh | 2 + @@ -64,7 +65,7 @@ tools/testing/selftests/bpf/DENYLIST.rhel | 76 ++ tools/testing/selftests/bpf/Makefile | 2 +- tools/testing/selftests/bpf/prog_tests/ksyms_btf.c | 31 - - 66 files changed, 2103 insertions(+), 190 deletions(-) + 67 files changed, 2108 insertions(+), 191 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index f74da642290a..06c8bb2075e6 100644 @@ -3258,6 +3259,23 @@ index a4bef2c48a55..bdf53241bd7b 100644 } module_init(bcm_module_init); +diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c +index 8e6f3a734ba0..e75d2932475a 100644 +--- a/net/packet/af_packet.c ++++ b/net/packet/af_packet.c +@@ -4561,7 +4561,11 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u, + + spin_lock(&po->bind_lock); + WRITE_ONCE(po->num, num); +- if (was_running) ++ /* ++ * NETDEV_UNREGISTER may have invalidated the binding while bind_lock ++ * was dropped above. Do not re-add a fanout hook to a dead device. ++ */ ++ if (was_running && READ_ONCE(po->ifindex) != -1) + register_prot_hook(sk); + + spin_unlock(&po->bind_lock); diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c index 20f7f9ee0b35..3e67600a4a1a 100644 --- a/net/sched/cls_api.c diff --git a/sources b/sources index dd28e1298..ee471dca4 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (linux-7.1.4.tar.xz) = 164f7c0353dfcf1eaacf886530273271d473314a9f99d9441a63bfc24368c8d2f194552bd4800dd440bf824598cbd74263b1b544dc61307517b8208acf9b4a7a -SHA512 (kernel-abi-stablelists-7.1.4.tar.xz) = 374a2880e321d511b020f463c9e2bda540da26f93d717c92f8765d35e1f0d15dce201f0a08c18a8dea8f785532a78924cfa603d05865188c48e2336d6953913e +SHA512 (kernel-abi-stablelists-7.1.4.tar.xz) = 451dc36f5087e3226637839e6ee4712d2202154cd353237892198fffee908935f92d23ba3efb9221b2758cb5f4557c735a255faf0da8f3a22dabb7f2d82c0989 SHA512 (kernel-kabi-dw-7.1.4.tar.xz) = 8b0322a90c6897047f21ab53a9aa4875df9ad1f58c4745923ed75aef9a968eb2eea272b80124a88295df61d500d4a67f698a2529fd6811604b613867f0e27fa8