From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Masami Hiramatsu <mhiramat@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
Andrew Morton <akpm@linux-foundation.org>,
Ye Bin <yebin10@huawei.com>
Subject: [for-linus][PATCH 2/5] ftrace: Dont allocate ftrace module map if ftrace is disabled
Date: Tue, 03 Jun 2025 13:11:51 -0400 [thread overview]
Message-ID: <20250603171228.597721946@goodmis.org> (raw)
In-Reply-To: <20250603171149.582996770@goodmis.org>
From: Ye Bin <yebin10@huawei.com>
If ftrace is disabled, it is meaningless to allocate a module map.
Add a check in allocate_ftrace_mod_map() to not allocate if ftrace is
disabled.
Link: https://lore.kernel.org/20250529111955.2349189-3-yebin@huaweicloud.com
Signed-off-by: Ye Bin <yebin10@huawei.com>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
---
kernel/trace/ftrace.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 84fd2f8263fa..a7291685902e 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -7631,6 +7631,9 @@ allocate_ftrace_mod_map(struct module *mod,
{
struct ftrace_mod_map *mod_map;
+ if (ftrace_disabled)
+ return NULL;
+
mod_map = kmalloc(sizeof(*mod_map), GFP_KERNEL);
if (!mod_map)
return NULL;
--
2.47.2
next prev parent reply other threads:[~2025-06-03 17:11 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-03 17:11 [for-linus][PATCH 0/5] tracing: Fixes for v6.16 Steven Rostedt
2025-06-03 17:11 ` [for-linus][PATCH 1/5] ftrace: Fix UAF when lookup kallsym after ftrace disabled Steven Rostedt
2025-06-03 17:11 ` Steven Rostedt [this message]
2025-06-03 17:11 ` [for-linus][PATCH 3/5] xdp: Remove unused mem_return_failed event Steven Rostedt
2025-06-05 14:27 ` John Fastabend
2025-06-03 17:11 ` [for-linus][PATCH 4/5] genirq/matrix: Remove unused irq_matrix_alloc_reserved tracepoint Steven Rostedt
2025-06-03 17:11 ` [for-linus][PATCH 5/5] fsdax: Remove unused trace events for dax insert mapping Steven Rostedt
2025-06-03 18:13 ` Dan Williams
2025-06-03 19:19 ` Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250603171228.597721946@goodmis.org \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mathieu.desnoyers@efficios.com \
--cc=mhiramat@kernel.org \
--cc=yebin10@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®