netdev - Re: [PATCH iproute2 v2] ip: ip_print: if no json obj is initialized default fp is stdout

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] [day] [month] [year] [list]

Message-ID: <CAM_1_Kxj-=0vZ_hy8r6g8Gt8CxPQ2+TV0suU9i_bD1DJ-UuEdw@mail.gmail.com>
Date:   Wed, 20 Sep 2017 18:22:36 -0700
From:   Julien Fortin <julien@...ulusnetworks.com>
To:     netdev@...r.kernel.org
Cc:     Roopa Prabhu <roopa@...ulusnetworks.com>,
        Nikolay Aleksandrov <nikolay@...ulusnetworks.com>,
        David Ahern <dsa@...ulusnetworks.com>,
        Julien Fortin <julien@...ulusnetworks.com>
Subject: Re: [PATCH iproute2 v2] ip: ip_print: if no json obj is initialized
 default fp is stdout

looks like git-mail ate all the traceback lines starting with #, will
re-submit v3

On Wed, Sep 20, 2017 at 6:16 PM, Julien Fortin
<julien@...ulusnetworks.com> wrote:
> From: Julien Fortin <julien@...ulusnetworks.com>
>
> The ip monitor didn't call `new_json_obj` (even for in non json context),
> so the static FILE* _fp variable wasn't initialized, thus raising a
> SIGSEGV in ipaddress.c. This patch should fix this issue for good, new
> paths won't have to call `new_json_obj`.
>
> $ ip -t mon label link
> fmt=fmt@...ry=0x45460d “%d: “, value=<optimized out>) at ip_print.c:132
> at libnetlink.c:761
>
> Traceback can be seen when running the following command in a new terminal.
> $ ip link add dev br0 type bridge
>
> Fixes: 6377572f ("ip: ip_print: add new API to print JSON or regular format output")
> Reported-by: David Ahern <dsa@...ulusnetworks.com>
> Reviewed-by: David Ahern <dsa@...ulusnetworks.com>
> Signed-off-by: Julien Fortin <julien@...ulusnetworks.com>
> ---
>  ip/ip_print.c | 21 +++++++++++++--------
>  1 file changed, 13 insertions(+), 8 deletions(-)
>
> diff --git a/ip/ip_print.c b/ip/ip_print.c
> index 4cd6a0bc..7eb4c6da 100644
> --- a/ip/ip_print.c
> +++ b/ip/ip_print.c
> @@ -23,6 +23,11 @@ static FILE *_fp;
>  #define _IS_JSON_CONTEXT(type) ((type & PRINT_JSON || type & PRINT_ANY) && _jw)
>  #define _IS_FP_CONTEXT(type) (!_jw && (type & PRINT_FP || type & PRINT_ANY))
>
> +static inline FILE *_get_fp(void)
> +{
> +       return _fp ? _fp : stdout;
> +};
> +
>  void new_json_obj(int json, FILE *fp)
>  {
>         if (json) {
> @@ -91,7 +96,7 @@ void open_json_array(enum output_type type, const char *str)
>                         jsonw_name(_jw, str);
>                 jsonw_start_array(_jw);
>         } else if (_IS_FP_CONTEXT(type)) {
> -               fprintf(_fp, "%s", str);
> +               fprintf(_get_fp(), "%s", str);
>         }
>  }
>
> @@ -105,7 +110,7 @@ void close_json_array(enum output_type type, const char *str)
>                 jsonw_end_array(_jw);
>                 jsonw_pretty(_jw, true);
>         } else if (_IS_FP_CONTEXT(type)) {
> -               fprintf(_fp, "%s", str);
> +               fprintf(_get_fp(), "%s", str);
>         }
>  }
>
> @@ -126,7 +131,7 @@ void close_json_array(enum output_type type, const char *str)
>                         else                                            \
>                                 jsonw_##type_name##_field(_jw, key, value); \
>                 } else if (_IS_FP_CONTEXT(t)) {                         \
> -                       color_fprintf(_fp, color, fmt, value);          \
> +                       color_fprintf(_get_fp(), color, fmt, value);    \
>                 }                                                       \
>         }
>  _PRINT_FUNC(int, int);
> @@ -149,7 +154,7 @@ void print_color_string(enum output_type type,
>                 else
>                         jsonw_string_field(_jw, key, value);
>         } else if (_IS_FP_CONTEXT(type)) {
> -               color_fprintf(_fp, color, fmt, value);
> +               color_fprintf(_get_fp(), color, fmt, value);
>         }
>  }
>
> @@ -170,7 +175,7 @@ void print_color_bool(enum output_type type,
>                 else
>                         jsonw_bool(_jw, value);
>         } else if (_IS_FP_CONTEXT(type)) {
> -               color_fprintf(_fp, color, fmt, value ? "true" : "false");
> +               color_fprintf(_get_fp(), color, fmt, value ? "true" : "false");
>         }
>  }
>
> @@ -189,7 +194,7 @@ void print_color_0xhex(enum output_type type,
>                 snprintf(b1, sizeof(b1), "%#x", hex);
>                 print_string(PRINT_JSON, key, NULL, b1);
>         } else if (_IS_FP_CONTEXT(type)) {
> -               color_fprintf(_fp, color, fmt, hex);
> +               color_fprintf(_get_fp(), color, fmt, hex);
>         }
>  }
>
> @@ -208,7 +213,7 @@ void print_color_hex(enum output_type type,
>                 else
>                         jsonw_string(_jw, b1);
>         } else if (_IS_FP_CONTEXT(type)) {
> -               color_fprintf(_fp, color, fmt, hex);
> +               color_fprintf(_get_fp(), color, fmt, hex);
>         }
>  }
>
> @@ -228,6 +233,6 @@ void print_color_null(enum output_type type,
>                 else
>                         jsonw_null(_jw);
>         } else if (_IS_FP_CONTEXT(type)) {
> -               color_fprintf(_fp, color, fmt, value);
> +               color_fprintf(_get_fp(), color, fmt, value);
>         }
>  }
> --
> 2.14.1
>