From: Greg Kroah-Hartman Date: Tue, 17 Dec 2024 09:08:02 +0000 (+0100) Subject: 5.15-stable patches X-Git-Tag: v5.4.288~25 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=29ef5c988646feb8d6f22012a2b4c2b9c10616d5;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: revert-parisc-fix-a-possible-dma-corruption.patch tracing-kprobes-skip-symbol-counting-logic-for-module-symbols-in-create_local_trace_kprobe.patch --- diff --git a/queue-5.15/revert-parisc-fix-a-possible-dma-corruption.patch b/queue-5.15/revert-parisc-fix-a-possible-dma-corruption.patch new file mode 100644 index 00000000000..3227b839b1d --- /dev/null +++ b/queue-5.15/revert-parisc-fix-a-possible-dma-corruption.patch @@ -0,0 +1,53 @@ +From 62da5343bf73cd4c4865ff08516b9c9bd6ace678 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +Date: Tue, 17 Dec 2024 10:06:00 +0100 +Subject: Revert "parisc: fix a possible DMA corruption" + +From: Greg Kroah-Hartman + +This reverts commit dadac97f066a67334268132c1e2d0fd599fbcbec which is +commit 7ae04ba36b381bffe2471eff3a93edced843240f upstream. + +It is reported to cause build failures. + +Reported-by: Guenter Roeck +Link: https://lore.kernel.org/r/436a575b-4ec0-43a2-b4e9-7eb00d9bbbeb@roeck-us.net +Cc: Mikulas Patocka +Cc: Helge Deller +Cc: Mingli Yu +Signed-off-by: Greg Kroah-Hartman +--- + arch/parisc/Kconfig | 1 - + arch/parisc/include/asm/cache.h | 11 +---------- + 2 files changed, 1 insertion(+), 11 deletions(-) + +--- a/arch/parisc/Kconfig ++++ b/arch/parisc/Kconfig +@@ -15,7 +15,6 @@ config PARISC + select ARCH_SPLIT_ARG64 if !64BIT + select ARCH_SUPPORTS_HUGETLBFS if PA20 + select ARCH_SUPPORTS_MEMORY_FAILURE +- select ARCH_HAS_CACHE_LINE_SIZE + select DMA_OPS + select RTC_CLASS + select RTC_DRV_GENERIC +--- a/arch/parisc/include/asm/cache.h ++++ b/arch/parisc/include/asm/cache.h +@@ -20,16 +20,7 @@ + + #define SMP_CACHE_BYTES L1_CACHE_BYTES + +-#ifdef CONFIG_PA20 +-#define ARCH_DMA_MINALIGN 128 +-#else +-#define ARCH_DMA_MINALIGN 32 +-#endif +-#define ARCH_KMALLOC_MINALIGN 16 /* ldcw requires 16-byte alignment */ +- +-#define arch_slab_minalign() ((unsigned)dcache_stride) +-#define cache_line_size() dcache_stride +-#define dma_get_cache_alignment cache_line_size ++#define ARCH_DMA_MINALIGN L1_CACHE_BYTES + + #define __read_mostly __section(".data..read_mostly") + diff --git a/queue-5.15/series b/queue-5.15/series index dede5d47210..b77e7a6b2b3 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -38,3 +38,5 @@ team-fix-feature-propagation-of-netif_f_gso_encap_al.patch acpica-events-evxfregn-don-t-release-the-contextmute.patch blk-iocost-avoid-using-clamp-on-inuse-in-__propagate.patch bpf-sync_linked_regs-must-preserve-subreg_def.patch +tracing-kprobes-skip-symbol-counting-logic-for-module-symbols-in-create_local_trace_kprobe.patch +revert-parisc-fix-a-possible-dma-corruption.patch diff --git a/queue-5.15/tracing-kprobes-skip-symbol-counting-logic-for-module-symbols-in-create_local_trace_kprobe.patch b/queue-5.15/tracing-kprobes-skip-symbol-counting-logic-for-module-symbols-in-create_local_trace_kprobe.patch new file mode 100644 index 00000000000..c250cc17b2b --- /dev/null +++ b/queue-5.15/tracing-kprobes-skip-symbol-counting-logic-for-module-symbols-in-create_local_trace_kprobe.patch @@ -0,0 +1,42 @@ +From kniv@yandex-team.ru Tue Dec 17 09:59:08 2024 +From: Nikolay Kuratov +Date: Mon, 16 Dec 2024 14:19:23 +0300 +Subject: tracing/kprobes: Skip symbol counting logic for module symbols in create_local_trace_kprobe() +To: stable@vger.kernel.org +Cc: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, Masami Hiramatsu , Francis Laniel , Steven Rostedt , Mathieu Desnoyers , Nikolay Kuratov +Message-ID: <20241216111923.2547104-1-kniv@yandex-team.ru> + +From: Nikolay Kuratov + +commit b022f0c7e404 ("tracing/kprobes: Return EADDRNOTAVAIL when func matches several symbols") +avoids checking number_of_same_symbols() for module symbol in +__trace_kprobe_create(), but create_local_trace_kprobe() should avoid this +check too. Doing this check leads to ENOENT for module_name:symbol_name +constructions passed over perf_event_open. + +No bug in newer kernels as it was fixed more generally by +commit 9d8616034f16 ("tracing/kprobes: Add symbol counting check when module loads") + +Link: https://lore.kernel.org/linux-trace-kernel/20240705161030.b3ddb33a8167013b9b1da202@kernel.org +Fixes: b022f0c7e404 ("tracing/kprobes: Return EADDRNOTAVAIL when func matches several symbols") +Signed-off-by: Nikolay Kuratov +Signed-off-by: Greg Kroah-Hartman +--- +v1 -> v2: + * Reword commit title and message + * Send for stable instead of mainline + + kernel/trace/trace_kprobe.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/kernel/trace/trace_kprobe.c ++++ b/kernel/trace/trace_kprobe.c +@@ -1823,7 +1823,7 @@ create_local_trace_kprobe(char *func, vo + int ret; + char *event; + +- if (func) { ++ if (func && !strchr(func, ':')) { + unsigned int count; + + count = number_of_same_symbols(func);