lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.12 400/700] tools/bpftool: Fix error return code in do_batch()
    Date
    From: Zhihao Cheng <chengzhihao1@huawei.com>

    [ Upstream commit ca16b429f39b4ce013bfa7e197f25681e65a2a42 ]

    Fix to return a negative error code from the error handling
    case instead of 0, as done elsewhere in this function.

    Fixes: 668da745af3c2 ("tools: bpftool: add support for quotations ...")
    Reported-by: Hulk Robot <hulkci@huawei.com>
    Signed-off-by: Zhihao Cheng <chengzhihao1@huawei.com>
    Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
    Reviewed-by: Quentin Monnet <quentin@isovalent.com>
    Link: https://lore.kernel.org/bpf/20210609115916.2186872-1-chengzhihao1@huawei.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/bpf/bpftool/main.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/tools/bpf/bpftool/main.c b/tools/bpf/bpftool/main.c
    index d9afb730136a..0f36b9edd3f5 100644
    --- a/tools/bpf/bpftool/main.c
    +++ b/tools/bpf/bpftool/main.c
    @@ -340,8 +340,10 @@ static int do_batch(int argc, char **argv)
    n_argc = make_args(buf, n_argv, BATCH_ARG_NB_MAX, lines);
    if (!n_argc)
    continue;
    - if (n_argc < 0)
    + if (n_argc < 0) {
    + err = n_argc;
    goto err_close;
    + }

    if (json_output) {
    jsonw_start_object(json_wtr);
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-12 10:10    [W:4.056 / U:0.156 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site