lkml.org 
[lkml]   [2020]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 508/639] tools: bpftool: fix arguments for p_err() in do_event_pipe()
    Date
    From: Quentin Monnet <quentin.monnet@netronome.com>

    [ Upstream commit 9def249dc8409ffc1f5a1d7195f1c462f2b49c07 ]

    The last argument passed to some calls to the p_err() functions is not
    correct, it should be "*argv" instead of "**argv". This may lead to a
    segmentation fault error if CPU IDs or indices from the command line
    cannot be parsed correctly. Let's fix this.

    Fixes: f412eed9dfde ("tools: bpftool: add simple perf event output reader")
    Signed-off-by: Quentin Monnet <quentin.monnet@netronome.com>
    Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
    Signed-off-by: Alexei Starovoitov <ast@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/bpf/bpftool/map_perf_ring.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/tools/bpf/bpftool/map_perf_ring.c b/tools/bpf/bpftool/map_perf_ring.c
    index 6d41323be291b..8ec0148d7426d 100644
    --- a/tools/bpf/bpftool/map_perf_ring.c
    +++ b/tools/bpf/bpftool/map_perf_ring.c
    @@ -205,7 +205,7 @@ int do_event_pipe(int argc, char **argv)
    NEXT_ARG();
    cpu = strtoul(*argv, &endptr, 0);
    if (*endptr) {
    - p_err("can't parse %s as CPU ID", **argv);
    + p_err("can't parse %s as CPU ID", *argv);
    goto err_close_map;
    }

    @@ -216,7 +216,7 @@ int do_event_pipe(int argc, char **argv)
    NEXT_ARG();
    index = strtoul(*argv, &endptr, 0);
    if (*endptr) {
    - p_err("can't parse %s as index", **argv);
    + p_err("can't parse %s as index", *argv);
    goto err_close_map;
    }

    --
    2.20.1


    \
     
     \ /
      Last update: 2020-01-24 12:29    [W:4.116 / U:0.416 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site