proxmox-mirrors/mirror_iproute2
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_iproute2 synced 2026-01-25 10:26:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ipaddress: Fix segfault in 'addr showdump'

Browse Source 
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.

Fixes: d0e720111a ("ip: ipaddress.c: add support for json output")
Signed-off-by: Phil Sutter <phil@nwl.cc>
This commit is contained in:
Phil Sutter 2017-09-12 16:58:12 +02:00 committed by Stephen Hemminger
parent b2947f8b2c
commit 1cfcf62c68
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ip/ipaddress.c
View File

@ -1801,17 +1801,31 @@ 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, "index", "if%d:\n", ifa->ifa_index);
print_addrinfo(NULL, n, stdout);
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);
open_json_object(NULL);
open_json_array(PRINT_JSON, "addr_info");
err = rtnl_from_file(stdin, &show_handler, NULL);
close_json_array(PRINT_JSON, NULL);
close_json_object();
delete_json_obj();
exit(err);
}
static int restore_handler(const struct sockaddr_nl *nl,