From 4179a2ef73293c5d15a8ed72d29db42094a2227a Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 16 Oct 2025 14:21:02 +0200 Subject: [PATCH] drop broken arm64 kprobe patch from older queues --- ...-call-set_memory_rox-for-kprobe-page.patch | 51 ------------------- queue-5.15/series | 1 - ...-call-set_memory_rox-for-kprobe-page.patch | 51 ------------------- queue-6.1/series | 1 - ...-call-set_memory_rox-for-kprobe-page.patch | 51 ------------------- queue-6.6/series | 1 - 6 files changed, 156 deletions(-) delete mode 100644 queue-5.15/arm64-kprobes-call-set_memory_rox-for-kprobe-page.patch delete mode 100644 queue-6.1/arm64-kprobes-call-set_memory_rox-for-kprobe-page.patch delete mode 100644 queue-6.6/arm64-kprobes-call-set_memory_rox-for-kprobe-page.patch diff --git a/queue-5.15/arm64-kprobes-call-set_memory_rox-for-kprobe-page.patch b/queue-5.15/arm64-kprobes-call-set_memory_rox-for-kprobe-page.patch deleted file mode 100644 index 162d09dd59..0000000000 --- a/queue-5.15/arm64-kprobes-call-set_memory_rox-for-kprobe-page.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 195a1b7d8388c0ec2969a39324feb8bebf9bb907 Mon Sep 17 00:00:00 2001 -From: Yang Shi -Date: Thu, 18 Sep 2025 09:23:49 -0700 -Subject: arm64: kprobes: call set_memory_rox() for kprobe page - -From: Yang Shi - -commit 195a1b7d8388c0ec2969a39324feb8bebf9bb907 upstream. - -The kprobe page is allocated by execmem allocator with ROX permission. -It needs to call set_memory_rox() to set proper permission for the -direct map too. It was missed. - -Fixes: 10d5e97c1bf8 ("arm64: use PAGE_KERNEL_ROX directly in alloc_insn_page") -Cc: -Signed-off-by: Yang Shi -Reviewed-by: Catalin Marinas -Signed-off-by: Will Deacon -Signed-off-by: Greg Kroah-Hartman ---- - arch/arm64/kernel/probes/kprobes.c | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - ---- a/arch/arm64/kernel/probes/kprobes.c -+++ b/arch/arm64/kernel/probes/kprobes.c -@@ -10,6 +10,7 @@ - - #define pr_fmt(fmt) "kprobes: " fmt - -+#include - #include - #include - #include -@@ -41,6 +42,17 @@ DEFINE_PER_CPU(struct kprobe_ctlblk, kpr - static void __kprobes - post_kprobe_handler(struct kprobe *, struct kprobe_ctlblk *, struct pt_regs *); - -+void *alloc_insn_page(void) -+{ -+ void *addr; -+ -+ addr = execmem_alloc(EXECMEM_KPROBES, PAGE_SIZE); -+ if (!addr) -+ return NULL; -+ set_memory_rox((unsigned long)addr, 1); -+ return addr; -+} -+ - static void __kprobes arch_prepare_ss_slot(struct kprobe *p) - { - kprobe_opcode_t *addr = p->ainsn.api.insn; diff --git a/queue-5.15/series b/queue-5.15/series index 08efb5de84..1524a58684 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -166,7 +166,6 @@ bpf-avoid-rcu-context-warning-when-unpinning-htab-wi.patch acpi-tad-add-missing-sysfs_remove_group-for-acpi_tad_rt.patch acpi-debug-fix-signedness-issues-in-read-write-helpers.patch arm64-dts-qcom-msm8916-add-missing-mdss-reset.patch -arm64-kprobes-call-set_memory_rox-for-kprobe-page.patch arm-omap2-pm33xx-core-ix-device-node-reference-leaks-in-amx3_idle_init.patch xen-events-cleanup-find_virq-return-codes.patch xen-manage-fix-suspend-error-path.patch diff --git a/queue-6.1/arm64-kprobes-call-set_memory_rox-for-kprobe-page.patch b/queue-6.1/arm64-kprobes-call-set_memory_rox-for-kprobe-page.patch deleted file mode 100644 index 162d09dd59..0000000000 --- a/queue-6.1/arm64-kprobes-call-set_memory_rox-for-kprobe-page.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 195a1b7d8388c0ec2969a39324feb8bebf9bb907 Mon Sep 17 00:00:00 2001 -From: Yang Shi -Date: Thu, 18 Sep 2025 09:23:49 -0700 -Subject: arm64: kprobes: call set_memory_rox() for kprobe page - -From: Yang Shi - -commit 195a1b7d8388c0ec2969a39324feb8bebf9bb907 upstream. - -The kprobe page is allocated by execmem allocator with ROX permission. -It needs to call set_memory_rox() to set proper permission for the -direct map too. It was missed. - -Fixes: 10d5e97c1bf8 ("arm64: use PAGE_KERNEL_ROX directly in alloc_insn_page") -Cc: -Signed-off-by: Yang Shi -Reviewed-by: Catalin Marinas -Signed-off-by: Will Deacon -Signed-off-by: Greg Kroah-Hartman ---- - arch/arm64/kernel/probes/kprobes.c | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - ---- a/arch/arm64/kernel/probes/kprobes.c -+++ b/arch/arm64/kernel/probes/kprobes.c -@@ -10,6 +10,7 @@ - - #define pr_fmt(fmt) "kprobes: " fmt - -+#include - #include - #include - #include -@@ -41,6 +42,17 @@ DEFINE_PER_CPU(struct kprobe_ctlblk, kpr - static void __kprobes - post_kprobe_handler(struct kprobe *, struct kprobe_ctlblk *, struct pt_regs *); - -+void *alloc_insn_page(void) -+{ -+ void *addr; -+ -+ addr = execmem_alloc(EXECMEM_KPROBES, PAGE_SIZE); -+ if (!addr) -+ return NULL; -+ set_memory_rox((unsigned long)addr, 1); -+ return addr; -+} -+ - static void __kprobes arch_prepare_ss_slot(struct kprobe *p) - { - kprobe_opcode_t *addr = p->ainsn.api.insn; diff --git a/queue-6.1/series b/queue-6.1/series index 0450d3c6e4..4c3a72cb41 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -54,7 +54,6 @@ acpi-debug-fix-signedness-issues-in-read-write-helpers.patch arm64-dts-qcom-msm8916-add-missing-mdss-reset.patch arm64-dts-qcom-sdm845-fix-slimbam-num-channels-ees.patch arm64-dts-ti-k3-am62a-main-fix-main-padcfg-length.patch -arm64-kprobes-call-set_memory_rox-for-kprobe-page.patch arm-omap2-pm33xx-core-ix-device-node-reference-leaks-in-amx3_idle_init.patch cpuidle-governors-menu-avoid-using-invalid-recent-intervals-data.patch dt-bindings-phy-rockchip-inno-csi-dphy-make-power-domains-non-required.patch diff --git a/queue-6.6/arm64-kprobes-call-set_memory_rox-for-kprobe-page.patch b/queue-6.6/arm64-kprobes-call-set_memory_rox-for-kprobe-page.patch deleted file mode 100644 index 162d09dd59..0000000000 --- a/queue-6.6/arm64-kprobes-call-set_memory_rox-for-kprobe-page.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 195a1b7d8388c0ec2969a39324feb8bebf9bb907 Mon Sep 17 00:00:00 2001 -From: Yang Shi -Date: Thu, 18 Sep 2025 09:23:49 -0700 -Subject: arm64: kprobes: call set_memory_rox() for kprobe page - -From: Yang Shi - -commit 195a1b7d8388c0ec2969a39324feb8bebf9bb907 upstream. - -The kprobe page is allocated by execmem allocator with ROX permission. -It needs to call set_memory_rox() to set proper permission for the -direct map too. It was missed. - -Fixes: 10d5e97c1bf8 ("arm64: use PAGE_KERNEL_ROX directly in alloc_insn_page") -Cc: -Signed-off-by: Yang Shi -Reviewed-by: Catalin Marinas -Signed-off-by: Will Deacon -Signed-off-by: Greg Kroah-Hartman ---- - arch/arm64/kernel/probes/kprobes.c | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - ---- a/arch/arm64/kernel/probes/kprobes.c -+++ b/arch/arm64/kernel/probes/kprobes.c -@@ -10,6 +10,7 @@ - - #define pr_fmt(fmt) "kprobes: " fmt - -+#include - #include - #include - #include -@@ -41,6 +42,17 @@ DEFINE_PER_CPU(struct kprobe_ctlblk, kpr - static void __kprobes - post_kprobe_handler(struct kprobe *, struct kprobe_ctlblk *, struct pt_regs *); - -+void *alloc_insn_page(void) -+{ -+ void *addr; -+ -+ addr = execmem_alloc(EXECMEM_KPROBES, PAGE_SIZE); -+ if (!addr) -+ return NULL; -+ set_memory_rox((unsigned long)addr, 1); -+ return addr; -+} -+ - static void __kprobes arch_prepare_ss_slot(struct kprobe *p) - { - kprobe_opcode_t *addr = p->ainsn.api.insn; diff --git a/queue-6.6/series b/queue-6.6/series index 99ca59312e..58679952f7 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -62,7 +62,6 @@ arm64-dts-qcom-msm8916-add-missing-mdss-reset.patch arm64-dts-qcom-msm8939-add-missing-mdss-reset.patch arm64-dts-qcom-sdm845-fix-slimbam-num-channels-ees.patch arm64-dts-ti-k3-am62a-main-fix-main-padcfg-length.patch -arm64-kprobes-call-set_memory_rox-for-kprobe-page.patch arm-omap2-pm33xx-core-ix-device-node-reference-leaks-in-amx3_idle_init.patch dt-bindings-phy-rockchip-inno-csi-dphy-make-power-domains-non-required.patch xen-events-cleanup-find_virq-return-codes.patch -- 2.47.3