lkml.org 
[lkml]   [2018]   [Dec]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 032/142] tools: bpftool: prevent infinite loop in get_fdinfo()
    Date
    4.19-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    [ Upstream commit 53909030aa29bffe1f8490df62176c2375135652 ]

    Function getline() returns -1 on failure to read a line, thus creating
    an infinite loop in get_fdinfo() if the key is not found. Fix it by
    calling the function only as long as we get a strictly positive return
    value.

    Found by copying the code for a key which is not always present...

    Fixes: 71bb428fe2c1 ("tools: bpf: add bpftool")
    Signed-off-by: Quentin Monnet <quentin.monnet@netronome.com>
    Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
    Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/bpf/bpftool/common.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/tools/bpf/bpftool/common.c b/tools/bpf/bpftool/common.c
    index b3a0709ea7ed..fcaf00621102 100644
    --- a/tools/bpf/bpftool/common.c
    +++ b/tools/bpf/bpftool/common.c
    @@ -304,7 +304,7 @@ char *get_fdinfo(int fd, const char *key)
    return NULL;
    }

    - while ((n = getline(&line, &line_n, fdi))) {
    + while ((n = getline(&line, &line_n, fdi)) > 0) {
    char *value;
    int len;

    --
    2.19.1


    \
     
     \ /
      Last update: 2018-12-14 13:44    [W:4.343 / U:0.296 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site