Liu Chuang (1): arm64/openeuler_defconfig: add not set config to fix compiling error
Masami Hiramatsu (1): tracing/kprobes: Do the notrace functions check without kprobes on ftrace
arch/arm64/configs/openeuler_defconfig | 1 + kernel/trace/Kconfig | 2 +- kernel/trace/trace_kprobe.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-)
From: Masami Hiramatsu mhiramat@kernel.org
stable inclusion from stable-v4.19.169 commit 4ec3187d17c6915f02e40b2c7b1f41d0fdda1eb4 category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I9093Z CVE: NA
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=...
--------------------------------
commit 7bb83f6fc4ee84e95d0ac0d14452c2619fb3fe70 upstream.
Enable the notrace function check on the architecture which doesn't support kprobes on ftrace but support dynamic ftrace. This notrace function check is not only for the kprobes on ftrace but also sw-breakpoint based kprobes. Thus there is no reason to limit this check for the arch which supports kprobes on ftrace.
This also changes the dependency of Kconfig. Because kprobe event uses the function tracer's address list for identifying notrace function, if the CONFIG_DYNAMIC_FTRACE=n, it can not check whether the target function is notrace or not.
Link: https://lkml.kernel.org/r/20210105065730.2634785-1-naveen.n.rao@linux.vnet.i... Link: https://lkml.kernel.org/r/161007957862.114704.4512260007555399463.stgit@devn...
Cc: stable@vger.kernel.org Fixes: 45408c4f92506 ("tracing: kprobes: Prohibit probing on notrace function") Acked-by: Naveen N. Rao naveen.n.rao@linux.vnet.ibm.com Signed-off-by: Masami Hiramatsu mhiramat@kernel.org Signed-off-by: Steven Rostedt (VMware) rostedt@goodmis.org Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org Signed-off-by: Liu Chuang liuchuang40@huawei.com --- kernel/trace/Kconfig | 2 +- kernel/trace/trace_kprobe.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig index 5e3de28c7677..e656d1e232da 100644 --- a/kernel/trace/Kconfig +++ b/kernel/trace/Kconfig @@ -476,7 +476,7 @@ config KPROBE_EVENTS config KPROBE_EVENTS_ON_NOTRACE bool "Do NOT protect notrace function from kprobe events" depends on KPROBE_EVENTS - depends on KPROBES_ON_FTRACE + depends on DYNAMIC_FTRACE default n help This is only for the developers who want to debug ftrace itself diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index 1b1da744a2e7..5a7beadaa4ef 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -517,7 +517,7 @@ disable_trace_kprobe(struct trace_kprobe *tk, struct trace_event_file *file) return ret; }
-#if defined(CONFIG_KPROBES_ON_FTRACE) && \ +#if defined(CONFIG_DYNAMIC_FTRACE) && \ !defined(CONFIG_KPROBE_EVENTS_ON_NOTRACE) static bool __within_notrace_func(unsigned long addr) {
hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I9093Z CVE: NA
--------------------------------
Fix aarch64 compile error:
241 | uint32_t value; | ^~~~~ drivers/scsi/qla2xxx/qla_nx2.c: In function ‘qla8044_process_reset_template’: drivers/scsi/qla2xxx/qla_nx2.c:135:2: warning: ‘value’ may be used uninitialized in this function [-Wmaybe-uninitialized]
Signed-off-by: Liu Chuang liuchuang40@huawei.com --- arch/arm64/configs/openeuler_defconfig | 1 + 1 file changed, 1 insertion(+)
diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig index 2a5d000749ff..4de42999f905 100644 --- a/arch/arm64/configs/openeuler_defconfig +++ b/arch/arm64/configs/openeuler_defconfig @@ -6618,6 +6618,7 @@ CONFIG_BRANCH_PROFILE_NONE=y CONFIG_STACK_TRACER=y CONFIG_BLK_DEV_IO_TRACE=y CONFIG_KPROBE_EVENTS=y +# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set CONFIG_UPROBE_EVENTS=y CONFIG_BPF_EVENTS=y CONFIG_PROBE_EVENTS=y
反馈: 您发送到kernel@openeuler.org的补丁/补丁集，转换为PR失败！ 邮件列表地址：https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/F... 失败原因：应用补丁/补丁集失败，Patch failed at 0001 tracing/kprobes: Do the notrace functions check without kprobes on ftrace 建议解决方法：请查看失败原因， 确认补丁是否可以应用在当前期望分支的最新代码上
FeedBack: The patch(es) which you have sent to kernel@openeuler.org has been converted to PR failed! Mailing list address: https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/F... Failed Reason: apply patch(es) failed, Patch failed at 0001 tracing/kprobes: Do the notrace functions check without kprobes on ftrace Suggest Solution: please checkout if the failed patch(es) can work on the newest codes in expected branch
-
Liu Chuang -
patchwork bot