lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 062/879] selftests/bpf: Fix file descriptor leak in load_kallsyms()
    Date
    From: Yuntao Wang <ytcoode@gmail.com>

    [ Upstream commit 2d0df01974ce2b59b6f7d5bd3ea58d74f12ddf85 ]

    Currently, if sym_cnt > 0, it just returns and does not close file, fix it.

    Signed-off-by: Yuntao Wang <ytcoode@gmail.com>
    Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
    Link: https://lore.kernel.org/bpf/20220405145711.49543-1-ytcoode@gmail.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/testing/selftests/bpf/trace_helpers.c | 9 +++++----
    1 file changed, 5 insertions(+), 4 deletions(-)

    diff --git a/tools/testing/selftests/bpf/trace_helpers.c b/tools/testing/selftests/bpf/trace_helpers.c
    index 3d6217e3aff7..9c4be2cdb21a 100644
    --- a/tools/testing/selftests/bpf/trace_helpers.c
    +++ b/tools/testing/selftests/bpf/trace_helpers.c
    @@ -25,15 +25,12 @@ static int ksym_cmp(const void *p1, const void *p2)

    int load_kallsyms(void)
    {
    - FILE *f = fopen("/proc/kallsyms", "r");
    + FILE *f;
    char func[256], buf[256];
    char symbol;
    void *addr;
    int i = 0;

    - if (!f)
    - return -ENOENT;
    -
    /*
    * This is called/used from multiplace places,
    * load symbols just once.
    @@ -41,6 +38,10 @@ int load_kallsyms(void)
    if (sym_cnt)
    return 0;

    + f = fopen("/proc/kallsyms", "r");
    + if (!f)
    + return -ENOENT;
    +
    while (fgets(buf, sizeof(buf), f)) {
    if (sscanf(buf, "%p %c %s", &addr, &symbol, func) != 3)
    break;
    --
    2.35.1


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