lkml.org 
[lkml]   [2022]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.19 0298/1157] tools/power turbostat: Fix file pointer leak
    Date
    From: Colin Ian King <colin.i.king@gmail.com>

    [ Upstream commit 5e5fd36c58d6c820f7292ee492c3731c9a104a41 ]

    Currently if a fscanf fails then an early return leaks an open
    file pointer. Fix this by fclosing the file before the return.
    Detected using static analysis with cppcheck:

    tools/power/x86/turbostat/turbostat.c:2039:3: error: Resource leak: fp [resourceLeak]

    Fixes: eae97e053fe3 ("tools/power turbostat: Support thermal throttle count print")
    Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
    Acked-by: Chen Yu <yu.c.chen@intel.com>
    Reviewed-by: Tom Rix <trix@redhat.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/power/x86/turbostat/turbostat.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
    index ede31a4287a0..2e9a751af260 100644
    --- a/tools/power/x86/turbostat/turbostat.c
    +++ b/tools/power/x86/turbostat/turbostat.c
    @@ -2035,9 +2035,9 @@ int get_core_throt_cnt(int cpu, unsigned long long *cnt)
    if (!fp)
    return -1;
    ret = fscanf(fp, "%lld", &tmp);
    + fclose(fp);
    if (ret != 1)
    return -1;
    - fclose(fp);
    *cnt = tmp;

    return 0;
    --
    2.35.1


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