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 452/639] tools: bpftool: use correct argument in cgroup errors
    Date
    From: Jakub Kicinski <jakub.kicinski@netronome.com>

    [ Upstream commit 6c6874f401e5a0caab3b6a0663169e1fb5e930bb ]

    cgroup code tries to use argv[0] as the cgroup path,
    but if it fails uses argv[1] to report errors.

    Fixes: 5ccda64d38cc ("bpftool: implement cgroup bpf operations")
    Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
    Reviewed-by: Quentin Monnet <quentin.monnet@netronome.com>
    Acked-by: Roman Gushchin <guro@fb.com>
    Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/bpf/bpftool/cgroup.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/tools/bpf/bpftool/cgroup.c b/tools/bpf/bpftool/cgroup.c
    index ee7a9765c6b32..adbcd84818f74 100644
    --- a/tools/bpf/bpftool/cgroup.c
    +++ b/tools/bpf/bpftool/cgroup.c
    @@ -164,7 +164,7 @@ static int do_show(int argc, char **argv)

    cgroup_fd = open(argv[0], O_RDONLY);
    if (cgroup_fd < 0) {
    - p_err("can't open cgroup %s", argv[1]);
    + p_err("can't open cgroup %s", argv[0]);
    goto exit;
    }

    @@ -345,7 +345,7 @@ static int do_attach(int argc, char **argv)

    cgroup_fd = open(argv[0], O_RDONLY);
    if (cgroup_fd < 0) {
    - p_err("can't open cgroup %s", argv[1]);
    + p_err("can't open cgroup %s", argv[0]);
    goto exit;
    }

    @@ -403,7 +403,7 @@ static int do_detach(int argc, char **argv)

    cgroup_fd = open(argv[0], O_RDONLY);
    if (cgroup_fd < 0) {
    - p_err("can't open cgroup %s", argv[1]);
    + p_err("can't open cgroup %s", argv[0]);
    goto exit;
    }

    --
    2.20.1


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