--- a/src/hotspot/os/linux/os_perf_linux.cpp	Tue Aug 07 00:06:52 2018 -0700
+++ b/src/hotspot/os/linux/os_perf_linux.cpp	Mon Aug 06 14:56:56 2018 +0200
@@ -1107,7 +1107,7 @@
 
   NetworkInterface* ret = NULL;
   for (cur_address = addresses; cur_address != NULL; cur_address = cur_address->ifa_next) {
-    if (cur_address->ifa_addr->sa_family != AF_PACKET) {
+    if ((cur_address->ifa_addr == NULL) || (cur_address->ifa_addr->sa_family != AF_PACKET)) {
       continue;
     }
 
@@ -1118,6 +1118,7 @@
     ret = cur;
   }
 
+  freeifaddrs(addresses);
   *network_interfaces = ret;
 
   return OS_OK;

--- a/src/hotspot/os/solaris/os_perf_solaris.cpp	Tue Aug 07 00:06:52 2018 -0700
+++ b/src/hotspot/os/solaris/os_perf_solaris.cpp	Mon Aug 06 14:56:56 2018 +0200
@@ -816,6 +816,7 @@
     }
   }
 
+  kstat_close(ctl);
   *network_interfaces = ret;
 
   return OS_OK;