External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 12:25:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

esxVMX_GatherSCSIControllers: avoid NULL dereference

Browse Source 
* src/esx/esx_vmx.c (esxVMX_GatherSCSIControllers): Do not dereference
a NULL disk->driverName.  We already detect this condition in another
case.  Check for it here, too.
This commit is contained in:
Jim Meyering 2010-04-14 10:18:20 +02:00
parent 29045d88ed
commit dc8dd7f8db
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/esx/esx_vmx.c
View File

@ -570,11 +570,12 @@ esxVMX_GatherSCSIControllers(virDomainDefPtr def, char *virtualDev[4],
if (virtualDev[controller] == NULL) {
virtualDev[controller] = disk->driverName;
} else if (STRCASENEQ(virtualDev[controller], disk->driverName)) {
} else if (disk->driverName == NULL ||
STRCASENEQ(virtualDev[controller], disk->driverName)) {
ESX_ERROR(VIR_ERR_INTERNAL_ERROR,
_("Inconsistent driver usage ('%s' is not '%s') on SCSI "
"controller index %d"), virtualDev[controller],
disk->driverName, controller);
disk->driverName ? disk->driverName : "?", controller);
return -1;
}
}