External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 07:59:00 +00:00
Code

qemuSnapshotDeleteValidate: Fix crash when disk is not found in VM definition

Browse Source 
qemuDomainDiskByName() can return a NULL pointer on failure.
But this returned value in qemuSnapshotDeleteValidate is not checked.It will make libvirtd crash.

Signed-off-by: kaihuan <jungleman759@gmail.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
kaihuan 2024-11-29 22:56:45 +08:00 committed by Peter Krempa
parent 00f9f2ca1f
commit c1166be347
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/qemu/qemu_snapshot.c
View File

@ -4243,8 +4243,19 @@ qemuSnapshotDeleteValidate(virDomainObj *vm,
virDomainDiskDef *vmdisk = NULL; virDomainDiskDef *vmdisk = NULL;
virDomainDiskDef *disk = NULL; virDomainDiskDef *disk = NULL;
vmdisk = qemuDomainDiskByName(vm->def, snapDisk->name); if (!(vmdisk = qemuDomainDiskByName(vm->def, snapDisk->name))) {
disk = qemuDomainDiskByName(snapdef->parent.dom, snapDisk->name); virReportError(VIR_ERR_OPERATION_FAILED,
_("disk '%1$s' referenced by snapshot '%2$s' not found in the current definition"),
snapDisk->name, snap->def->name);
return -1;
}
if (!(disk = qemuDomainDiskByName(snapdef->parent.dom, snapDisk->name))) {
virReportError(VIR_ERR_OPERATION_FAILED,
_("disk '%1$s' referenced by snapshot '%2$s' not found in the VM definition of the deleted snapshot"),
snapDisk->name, snap->def->name);
return -1;
}
if (!virStorageSourceIsSameLocation(vmdisk->src, disk->src)) { if (!virStorageSourceIsSameLocation(vmdisk->src, disk->src)) {
virReportError(VIR_ERR_OPERATION_UNSUPPORTED, virReportError(VIR_ERR_OPERATION_UNSUPPORTED,