]> git.ipfire.org Git - thirdparty/open-vm-tools.git/commitdiff
fix guestd crashes when Solaris GOS has vlan/vmxnet3 nic configured.
authorVMware, Inc <>
Thu, 18 Nov 2010 22:56:00 +0000 (14:56 -0800)
committerMarcelo Vanzin <mvanzin@vmware.com>
Thu, 18 Nov 2010 22:56:00 +0000 (14:56 -0800)
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>
open-vm-tools/services/plugins/guestInfo/getlib/guestInfoPosix.c

index cd7dfe5659b6ae4d69f36e643bf22bd030c41a4d..92bd804d27af4eb1b9624f3cb73d20cd67377fd8 100644 (file)
@@ -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];