lkml.org 
[lkml]   [2020]   [Nov]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 066/151] tracing: Fix the checking of stackidx in __ftrace_trace_stack
    Date
    From: Qiujun Huang <hqjagain@gmail.com>

    [ Upstream commit 906695e59324635c62b5ae59df111151a546ca66 ]

    The array size is FTRACE_KSTACK_NESTING, so the index FTRACE_KSTACK_NESTING
    is illegal too. And fix two typos by the way.

    Link: https://lkml.kernel.org/r/20201031085714.2147-1-hqjagain@gmail.com

    Signed-off-by: Qiujun Huang <hqjagain@gmail.com>
    Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    kernel/trace/trace.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
    index 2a357bda45cf0..f7cac11a90055 100644
    --- a/kernel/trace/trace.c
    +++ b/kernel/trace/trace.c
    @@ -2510,7 +2510,7 @@ trace_event_buffer_lock_reserve(struct ring_buffer **current_rb,
    /*
    * If tracing is off, but we have triggers enabled
    * we still need to look at the event data. Use the temp_buffer
    - * to store the trace event for the tigger to use. It's recusive
    + * to store the trace event for the trigger to use. It's recursive
    * safe and will not be recorded anywhere.
    */
    if (!entry && trace_file->flags & EVENT_FILE_FL_TRIGGER_COND) {
    @@ -2832,7 +2832,7 @@ static void __ftrace_trace_stack(struct ring_buffer *buffer,
    stackidx = __this_cpu_inc_return(ftrace_stack_reserve) - 1;

    /* This should never happen. If it does, yell once and skip */
    - if (WARN_ON_ONCE(stackidx > FTRACE_KSTACK_NESTING))
    + if (WARN_ON_ONCE(stackidx >= FTRACE_KSTACK_NESTING))
    goto out;

    /*
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-11-17 14:27    [W:3.972 / U:1.300 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site