mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-23 06:05:27 +00:00
esxVMX_GatherSCSIControllers: avoid NULL dereference
* 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:
parent
29045d88ed
commit
dc8dd7f8db
@ -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;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user