From 85d54f133c3b811d06fd8d55702ead03385a8a56 Mon Sep 17 00:00:00 2001 From: Maxim Nestratov Date: Mon, 6 Jun 2016 18:54:23 +0300 Subject: [PATCH] vz: fix crash when parsing unexpected disk configuration As it turned out PrlVmDev_GetStackIndex can return negative values without reporting an error, which is incorrect but nevertheless. After that we feed this negative index to virIndexToDiskName, which in turn returns NULL and we set it to virDomainDiskDef.dst. Using virDiskNameToBusDeviceIndex with a virDomainDiskDef structure which has NULL dst field crashes. Fix this by returning an error in prlsdkGetDiskId in such cases. Signed-off-by: Maxim Nestratov --- src/vz/vz_sdk.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 0e989e6598..99c5d4a4a2 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -539,6 +539,9 @@ prlsdkGetDiskId(PRL_HANDLE disk, bool isCt, int *bus, char **dst) return -1; } + if (NULL == *dst) + return -1; + return 0; }