From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Ingo Molnar <mingo@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Masami Hiramatsu <mhiramat@kernel.org>,
Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Subject: [for-next][PATCH 08/12] tracing: Fix missing trace_boot_init_histograms kstrdup NULL checks
Date: Tue, 26 Oct 2021 12:23:23 -0400 [thread overview]
Message-ID: <20211026162348.832650089@goodmis.org> (raw)
In-Reply-To: 20211026162315.297389528@goodmis.org
From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
trace_boot_init_histograms misses NULL pointer checks for kstrdup
failure.
Link: https://lkml.kernel.org/r/20211015195550.22742-1-mathieu.desnoyers@efficios.com
Fixes: 64dc7f6958ef5 ("tracing/boot: Show correct histogram error command")
Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
kernel/trace/trace_boot.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/kernel/trace/trace_boot.c b/kernel/trace/trace_boot.c
index 8d252f63cd78..0580287d7a0d 100644
--- a/kernel/trace/trace_boot.c
+++ b/kernel/trace/trace_boot.c
@@ -430,6 +430,8 @@ trace_boot_init_histograms(struct trace_event_file *file,
/* All digit started node should be instances. */
if (trace_boot_compose_hist_cmd(node, buf, size) == 0) {
tmp = kstrdup(buf, GFP_KERNEL);
+ if (!tmp)
+ return;
if (trigger_process_regex(file, buf) < 0)
pr_err("Failed to apply hist trigger: %s\n", tmp);
kfree(tmp);
@@ -439,6 +441,8 @@ trace_boot_init_histograms(struct trace_event_file *file,
if (xbc_node_find_subkey(hnode, "keys")) {
if (trace_boot_compose_hist_cmd(hnode, buf, size) == 0) {
tmp = kstrdup(buf, GFP_KERNEL);
+ if (!tmp)
+ return;
if (trigger_process_regex(file, buf) < 0)
pr_err("Failed to apply hist trigger: %s\n", tmp);
kfree(tmp);
--
2.33.0
next prev parent reply other threads:[~2021-10-26 16:24 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-26 16:23 [for-next][PATCH 00/12] tracing: More updates for 5.16 Steven Rostedt
2021-10-26 16:23 ` [for-next][PATCH 01/12] ftrace: Make ftrace_profile_pages_init static Steven Rostedt
2021-10-26 16:23 ` [for-next][PATCH 02/12] tools/latency-collector: Use correct size when writing queue_full_warning Steven Rostedt
2021-10-26 16:23 ` [for-next][PATCH 03/12] perf/core: allow ftrace for functions in kernel/event/core.c Steven Rostedt
2021-10-26 16:23 ` [for-next][PATCH 04/12] trace/osnoise: Fix an ifdef comment Steven Rostedt
2021-10-26 16:23 ` [for-next][PATCH 05/12] tracing/doc: Fix typos on the timerlat tracer documentation Steven Rostedt
2021-10-26 16:23 ` [for-next][PATCH 06/12] trace/osnoise: Add migrate-disabled field to the osnoise header Steven Rostedt
2021-10-26 16:23 ` [for-next][PATCH 07/12] trace/timerlat: Add migrate-disabled field to the timerlat header Steven Rostedt
2021-10-26 16:23 ` Steven Rostedt [this message]
2021-10-26 16:23 ` [for-next][PATCH 09/12] tracing/hwlat: Make some internal symbols static Steven Rostedt
2021-10-26 16:23 ` [for-next][PATCH 10/12] ftrace/sh: Add arch_ftrace_ops_list_func stub to have compressed image still link Steven Rostedt
2021-10-27 8:58 ` Sergey Shtylyov
2021-10-27 12:01 ` Steven Rostedt
2021-10-26 16:23 ` [for-next][PATCH 11/12] lib/bootconfig: Make xbc_alloc_mem() and xbc_free_mem() as __init function Steven Rostedt
2021-10-26 16:23 ` [for-next][PATCH 12/12] kprobes: Add a test case for stacktrace from kretprobe handler 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=20211026162348.832650089@goodmis.org \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=mhiramat@kernel.org \
--cc=mingo@kernel.org \
/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