fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-04-23 07:30:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

ip6: fix crash in nl_addr2str in libnl1

Browse source 
libnl1 doesn't check the first argument and crashes on NULL.
I got NULL gateway out of rtnl_route_get_gateway() for link local and
multicast routes (fe80::/64, ff00::/8).
This commit is contained in:
Jiří Klimeš 2012-05-24 14:44:41 +02:00
parent 228224a072
commit de47d95112
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/ip6-manager/nm-ip6-manager.c
View file

@ -598,11 +598,12 @@ dump_address_change (NMIP6Device *device, struct nlmsghdr *hdr, struct rtnl_addr
{
char *event;
struct nl_addr *addr;
char addr_str[40];
char addr_str[40] = "none";
event = hdr->nlmsg_type == RTM_NEWADDR ? "new" : "lost";
addr = rtnl_addr_get_local (rtnladdr);
nl_addr2str (addr, addr_str, 40);
if (addr)
nl_addr2str (addr, addr_str, 40);
nm_log_dbg (LOGD_IP6, "(%s) %s address: %s", device_get_iface (device), event, addr_str);
}
@ -612,15 +613,17 @@ dump_route_change (NMIP6Device *device, struct nlmsghdr *hdr, struct rtnl_route
{
char *event;
struct nl_addr *dst;
char dst_str[40];
char dst_str[40] = "none";
struct nl_addr *gateway;
char gateway_str[40];
char gateway_str[40] = "none";
event = hdr->nlmsg_type == RTM_NEWROUTE ? "new" : "lost";
dst = rtnl_route_get_dst (rtnlroute);
gateway = rtnl_route_get_gateway (rtnlroute);
nl_addr2str (dst, dst_str, 40);
nl_addr2str (gateway, gateway_str, 40);
if (dst)
nl_addr2str (dst, dst_str, 40);
if (gateway)
nl_addr2str (gateway, gateway_str, 40);
nm_log_dbg (LOGD_IP6, "(%s) %s route: %s via %s",device_get_iface (device), event, dst_str, gateway_str);
}