From: VMware, Inc <>
Date: Thu, 18 Nov 2010 22:56:00 +0000 (-0800)
Subject: fix guestd crashes when Solaris GOS has vlan/vmxnet3 nic configured.
X-Git-Tag: 2010.11.17-327185~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8f80db04c2e9121807ddf08602a51d88209f992;p=thirdparty%2Fopen-vm-tools.git

fix guestd crashes when Solaris GOS has vlan/vmxnet3 nic configured.

For the vlan/vmxnet3 interface, libdnet return its link address type as ADDR_TYPE_NONE
and addr_ntoa converts it to NULL, which causes crash in ReadInterfaceDetails().

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
---

diff --git a/open-vm-tools/services/plugins/guestInfo/getlib/guestInfoPosix.c b/open-vm-tools/services/plugins/guestInfo/getlib/guestInfoPosix.c
index cd7dfe565..92bd804d2 100644
--- a/open-vm-tools/services/plugins/guestInfo/getlib/guestInfoPosix.c
+++ b/open-vm-tools/services/plugins/guestInfo/getlib/guestInfoPosix.c
@@ -273,7 +273,8 @@ ReadInterfaceDetails(const struct intf_entry *entry,  // IN: current interface e
    ASSERT(entry);
    ASSERT(arg);
 
-   if (entry->intf_type == INTF_TYPE_ETH) {
+   if (entry->intf_type == INTF_TYPE_ETH &&
+       entry->intf_link_addr.addr_type == ADDR_TYPE_ETH) {
       GuestNicV3 *nic = NULL;
       char macAddress[NICINFO_MAC_LEN];