lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 524/917] tracing: Fix missing trace_boot_init_histograms kstrdup NULL checks
    Date
    From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

    [ Upstream commit 3c20bd3af535d64771b193bb4dd41ed662c464ce ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.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 8d252f63cd784..0580287d7a0d1 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


    \
     
     \ /
      Last update: 2021-11-16 01:10    [W:2.491 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site