lkml.org 
[lkml]   [2022]   [Aug]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.19 0869/1157] rtla: Fix double free
    Date
    From: Andreas Schwab <schwab@suse.de>

    [ Upstream commit 4f753c3be52c1d930afc0fe3169baa605dbaf611 ]

    Avoid double free by making trace_instance_destroy indempotent. When
    trace_instance_init fails, it calls trace_instance_destroy, but its only
    caller osnoise_destroy_tool calls it again.

    Link: https://lkml.kernel.org/r/mvmilnlkyzx.fsf_-_@suse.de

    Fixes: 0605bf009f18 ("rtla: Add osnoise tool")
    Signed-off-by: Andreas Schwab <schwab@suse.de>
    Acked-by: Daniel Bristot de Oliveira <bristot@kernel.org>
    Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/tracing/rtla/src/trace.c | 9 +++++++--
    1 file changed, 7 insertions(+), 2 deletions(-)

    diff --git a/tools/tracing/rtla/src/trace.c b/tools/tracing/rtla/src/trace.c
    index 5784c9f9e570..e1ba6d9f4265 100644
    --- a/tools/tracing/rtla/src/trace.c
    +++ b/tools/tracing/rtla/src/trace.c
    @@ -134,13 +134,18 @@ void trace_instance_destroy(struct trace_instance *trace)
    if (trace->inst) {
    disable_tracer(trace->inst);
    destroy_instance(trace->inst);
    + trace->inst = NULL;
    }

    - if (trace->seq)
    + if (trace->seq) {
    free(trace->seq);
    + trace->seq = NULL;
    + }

    - if (trace->tep)
    + if (trace->tep) {
    tep_free(trace->tep);
    + trace->tep = NULL;
    + }
    }

    /*
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-16 06:47    [W:4.023 / U:1.184 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site