* [PATCH] tracing: Fix missing trace_boot_init_histograms kstrdup NULL checks
@ 2021-10-15 19:55 Mathieu Desnoyers
2021-10-26 3:10 ` Steven Rostedt
0 siblings, 1 reply; 3+ messages in thread
From: Mathieu Desnoyers @ 2021-10-15 19:55 UTC (permalink / raw)
To: Steven Rostedt; +Cc: linux-kernel, Mathieu Desnoyers
trace_boot_init_histograms misses NULL pointer checks for kstrdup
failure.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Steven Rostedt <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.20.1
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] tracing: Fix missing trace_boot_init_histograms kstrdup NULL checks
2021-10-15 19:55 [PATCH] tracing: Fix missing trace_boot_init_histograms kstrdup NULL checks Mathieu Desnoyers
@ 2021-10-26 3:10 ` Steven Rostedt
2021-10-26 8:27 ` Masami Hiramatsu
0 siblings, 1 reply; 3+ messages in thread
From: Steven Rostedt @ 2021-10-26 3:10 UTC (permalink / raw)
To: Mathieu Desnoyers; +Cc: linux-kernel, Masami Hiramatsu
On Fri, 15 Oct 2021 15:55:50 -0400
Mathieu Desnoyers <mathieu.desnoyers@efficios.com> wrote:
> trace_boot_init_histograms misses NULL pointer checks for kstrdup
> failure.
>
> Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
> Cc: Steven Rostedt <rostedt@goodmis.org>
Masami,
Can you ack this?
-- Steve
> ---
> 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);
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] tracing: Fix missing trace_boot_init_histograms kstrdup NULL checks
2021-10-26 3:10 ` Steven Rostedt
@ 2021-10-26 8:27 ` Masami Hiramatsu
0 siblings, 0 replies; 3+ messages in thread
From: Masami Hiramatsu @ 2021-10-26 8:27 UTC (permalink / raw)
To: Steven Rostedt; +Cc: Mathieu Desnoyers, linux-kernel, Masami Hiramatsu
On Mon, 25 Oct 2021 23:10:17 -0400
Steven Rostedt <rostedt@goodmis.org> wrote:
> On Fri, 15 Oct 2021 15:55:50 -0400
> Mathieu Desnoyers <mathieu.desnoyers@efficios.com> wrote:
>
> > trace_boot_init_histograms misses NULL pointer checks for kstrdup
> > failure.
> >
> > Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
> > Cc: Steven Rostedt <rostedt@goodmis.org>
>
> Masami,
>
> Can you ack this?
Yes, thanks for reporting this!
Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
Thank you!
>
> -- Steve
>
> > ---
> > 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);
>
--
Masami Hiramatsu <mhiramat@kernel.org>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-10-26 8:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-15 19:55 [PATCH] tracing: Fix missing trace_boot_init_histograms kstrdup NULL checks Mathieu Desnoyers
2021-10-26 3:10 ` Steven Rostedt
2021-10-26 8:27 ` Masami Hiramatsu
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®