From: Julien Fortin <julien@cumulusnetworks.com>
To: Phil Sutter <phil@nwl.cc>
Cc: Stephen Hemminger <stephen@networkplumber.org>,
Hangbin Liu <liuhangbin@gmail.com>,
netdev@vger.kernel.org
Subject: Re: [iproute PATCH v2] ipaddress: Fix segfault in 'addr showdump'
Date: Thu, 14 Sep 2017 20:05:10 -0700 [thread overview]
Message-ID: <CAM_1_Ky97LTjdEgKUbDQxajskYe_YXqYhJyrLSomsq_uFuVdeQ@mail.gmail.com> (raw)
In-Reply-To: <20170913092034.7002-1-phil@nwl.cc>
v2 looks good to me, thanks for catching this segfault.
On Wed, Sep 13, 2017 at 2:20 AM, Phil Sutter <phil@nwl.cc> wrote:
> Obviously, 'addr showdump' feature wasn't adjusted to json output
> support. As a consequence, calls to print_string() in print_addrinfo()
> tried to dereference a NULL FILE pointer.
>
> Cc: Julien Fortin <julien@cumulusnetworks.com>
> Fixes: d0e720111aad2 ("ip: ipaddress.c: add support for json output")
> Signed-off-by: Phil Sutter <phil@nwl.cc>
Acked-by: Julien Fortin <julien@cumulusnetworks.com>
> --
> Changes since v1:
> Align json output with that of 'ip -j addr show':
> - Interface index label is 'ifindex', not 'index' and it doesn't belong
> to 'addr_info' array.
> - Create one 'addr_info' array per dumped address, not one for all.
> ---
> ip/ipaddress.c | 20 ++++++++++++++++++--
> 1 file changed, 18 insertions(+), 2 deletions(-)
>
> diff --git a/ip/ipaddress.c b/ip/ipaddress.c
> index 9797145023966..4c47809570410 100644
> --- a/ip/ipaddress.c
> +++ b/ip/ipaddress.c
> @@ -1801,17 +1801,33 @@ static int show_handler(const struct sockaddr_nl *nl,
> {
> struct ifaddrmsg *ifa = NLMSG_DATA(n);
>
> - printf("if%d:\n", ifa->ifa_index);
> + open_json_object(NULL);
> + print_int(PRINT_ANY, "ifindex", "if%d:\n", ifa->ifa_index);
> +
> + open_json_array(PRINT_JSON, "addr_info");
> + open_json_object(NULL);
> +
> print_addrinfo(NULL, n, stdout);
> +
> + close_json_object();
> + close_json_array(PRINT_JSON, NULL);
> +
> + close_json_object();
> return 0;
> }
>
> static int ipaddr_showdump(void)
> {
> + int err;
> +
> if (ipadd_dump_check_magic())
> exit(-1);
>
> - exit(rtnl_from_file(stdin, &show_handler, NULL));
> + new_json_obj(json, stdout);
> + err = rtnl_from_file(stdin, &show_handler, NULL);
> + delete_json_obj();
> +
> + exit(err);
> }
>
> static int restore_handler(const struct sockaddr_nl *nl,
> --
> 2.13.1
>
next prev parent reply other threads:[~2017-09-15 3:05 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-13 9:20 [iproute PATCH v2] ipaddress: Fix segfault in 'addr showdump' Phil Sutter
2017-09-15 3:05 ` Julien Fortin [this message]
2017-09-21 0:54 ` Stephen Hemminger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAM_1_Ky97LTjdEgKUbDQxajskYe_YXqYhJyrLSomsq_uFuVdeQ@mail.gmail.com \
--to=julien@cumulusnetworks.com \
--cc=liuhangbin@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=phil@nwl.cc \
--cc=stephen@networkplumber.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).