lkml.org 
[lkml]   [2020]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 041/252] tracing: Fix tracing_stat return values in error handling paths
    Date
    From: Luis Henriques <luis.henriques@canonical.com>

    [ Upstream commit afccc00f75bbbee4e4ae833a96c2d29a7259c693 ]

    tracing_stat_init() was always returning '0', even on the error paths. It
    now returns -ENODEV if tracing_init_dentry() fails or -ENOMEM if it fails
    to created the 'trace_stat' debugfs directory.

    Link: http://lkml.kernel.org/r/1410299381-20108-1-git-send-email-luis.henriques@canonical.com

    Fixes: ed6f1c996bfe4 ("tracing: Check return value of tracing_init_dentry()")
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    [ Pulled from the archeological digging of my INBOX ]
    Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    kernel/trace/trace_stat.c | 12 ++++++++----
    1 file changed, 8 insertions(+), 4 deletions(-)

    diff --git a/kernel/trace/trace_stat.c b/kernel/trace/trace_stat.c
    index 75bf1bcb4a8a5..bf68af63538b4 100644
    --- a/kernel/trace/trace_stat.c
    +++ b/kernel/trace/trace_stat.c
    @@ -278,18 +278,22 @@ static int tracing_stat_init(void)

    d_tracing = tracing_init_dentry();
    if (IS_ERR(d_tracing))
    - return 0;
    + return -ENODEV;

    stat_dir = tracefs_create_dir("trace_stat", d_tracing);
    - if (!stat_dir)
    + if (!stat_dir) {
    pr_warn("Could not create tracefs 'trace_stat' entry\n");
    + return -ENOMEM;
    + }
    return 0;
    }

    static int init_stat_file(struct stat_session *session)
    {
    - if (!stat_dir && tracing_stat_init())
    - return -ENODEV;
    + int ret;
    +
    + if (!stat_dir && (ret = tracing_stat_init()))
    + return ret;

    session->file = tracefs_create_file(session->ts->name, 0644,
    stat_dir,
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-02-14 18:12    [W:2.478 / U:0.804 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site