netdev - Re: [PATCH bpf-next] bpftool: Fix bpftool net output

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAPhsuW4A30LbkDJnthgtRZKN24KZMj=DooV-qW_+aM9Fih7gwg@mail.gmail.com>
Date:   Tue, 25 Sep 2018 21:33:01 -0700
From:   Song Liu <liu.song.a23@...il.com>
To:     Andrey Ignatov <rdna@...com>
Cc:     Networking <netdev@...r.kernel.org>,
        Alexei Starovoitov <ast@...nel.org>,
        Daniel Borkmann <daniel@...earbox.net>, yhs@...com
Subject: Re: [PATCH bpf-next] bpftool: Fix bpftool net output

On Tue, Sep 25, 2018 at 3:25 PM Andrey Ignatov <rdna@...com> wrote:
>
> Print `bpftool net` output to stdout instead of stderr. Only errors
> should be printed to stderr. Regular output should go to stdout and this
> is what all other subcommands of bpftool do, including --json and
> --pretty formats of `bpftool net` itself.
>
> Fixes: commit f6f3bac08ff9 ("tools/bpf: bpftool: add net support")
> Signed-off-by: Andrey Ignatov <rdna@...com>
> Acked-by: Yonghong Song <yhs@...com>

Acked-by: Song Liu <songliubraving@...com>

> ---
>  tools/bpf/bpftool/netlink_dumper.h | 18 +++++++++---------
>  1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/tools/bpf/bpftool/netlink_dumper.h b/tools/bpf/bpftool/netlink_dumper.h
> index 0788cfbbed0e..e3516b586a34 100644
> --- a/tools/bpf/bpftool/netlink_dumper.h
> +++ b/tools/bpf/bpftool/netlink_dumper.h
> @@ -16,7 +16,7 @@
>                 jsonw_name(json_wtr, name);             \
>                 jsonw_start_object(json_wtr);           \
>         } else {                                        \
> -               fprintf(stderr, "%s {", name);          \
> +               fprintf(stdout, "%s {", name);          \
>         }                                               \
>  }
>
> @@ -25,7 +25,7 @@
>         if (json_output)                                \
>                 jsonw_start_object(json_wtr);           \
>         else                                            \
> -               fprintf(stderr, "{");                   \
> +               fprintf(stdout, "{");                   \
>  }
>
>  #define NET_END_OBJECT_NESTED                          \
> @@ -33,7 +33,7 @@
>         if (json_output)                                \
>                 jsonw_end_object(json_wtr);             \
>         else                                            \
> -               fprintf(stderr, "}");                   \
> +               fprintf(stdout, "}");                   \
>  }
>
>  #define NET_END_OBJECT                                 \
> @@ -47,7 +47,7 @@
>         if (json_output)                                \
>                 jsonw_end_object(json_wtr);             \
>         else                                            \
> -               fprintf(stderr, "\n");                  \
> +               fprintf(stdout, "\n");                  \
>  }
>
>  #define NET_START_ARRAY(name, fmt_str)                 \
> @@ -56,7 +56,7 @@
>                 jsonw_name(json_wtr, name);             \
>                 jsonw_start_array(json_wtr);            \
>         } else {                                        \
> -               fprintf(stderr, fmt_str, name);         \
> +               fprintf(stdout, fmt_str, name);         \
>         }                                               \
>  }
>
> @@ -65,7 +65,7 @@
>         if (json_output)                                \
>                 jsonw_end_array(json_wtr);              \
>         else                                            \
> -               fprintf(stderr, "%s", endstr);          \
> +               fprintf(stdout, "%s", endstr);          \
>  }
>
>  #define NET_DUMP_UINT(name, fmt_str, val)              \
> @@ -73,7 +73,7 @@
>         if (json_output)                                \
>                 jsonw_uint_field(json_wtr, name, val);  \
>         else                                            \
> -               fprintf(stderr, fmt_str, val);          \
> +               fprintf(stdout, fmt_str, val);          \
>  }
>
>  #define NET_DUMP_STR(name, fmt_str, str)               \
> @@ -81,7 +81,7 @@
>         if (json_output)                                \
>                 jsonw_string_field(json_wtr, name, str);\
>         else                                            \
> -               fprintf(stderr, fmt_str, str);          \
> +               fprintf(stdout, fmt_str, str);          \
>  }
>
>  #define NET_DUMP_STR_ONLY(str)                         \
> @@ -89,7 +89,7 @@
>         if (json_output)                                \
>                 jsonw_string(json_wtr, str);            \
>         else                                            \
> -               fprintf(stderr, "%s ", str);            \
> +               fprintf(stdout, "%s ", str);            \
>  }
>
>  #endif
> --
> 2.17.1
>