External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-12 15:52:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemuDomainGetGuestInfo: Validate supported information types

Browse Source 
'qemuDomainGetGuestInfoCheckSupport' despite its name was not checking
whether the info types are supported. Convert the function to return
integers and include the check.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2020-03-13 09:05:48 +01:00
parent d7e6dd0669
commit 60527cbbc2
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/qemu/qemu_driver.c
View File

@ -22853,20 +22853,32 @@ qemuDomainGetLaunchSecurityInfo(virDomainPtr domain,
return ret; return ret;
} }
static const unsigned int supportedGuestInfoTypes = static const unsigned int qemuDomainGetGuestInfoSupportedTypes =
VIR_DOMAIN_GUEST_INFO_USERS | VIR_DOMAIN_GUEST_INFO_USERS |
VIR_DOMAIN_GUEST_INFO_OS | VIR_DOMAIN_GUEST_INFO_OS |
VIR_DOMAIN_GUEST_INFO_TIMEZONE | VIR_DOMAIN_GUEST_INFO_TIMEZONE |
VIR_DOMAIN_GUEST_INFO_HOSTNAME | VIR_DOMAIN_GUEST_INFO_HOSTNAME |
VIR_DOMAIN_GUEST_INFO_FILESYSTEM; VIR_DOMAIN_GUEST_INFO_FILESYSTEM;
static void static int
qemuDomainGetGuestInfoCheckSupport(unsigned int *types) qemuDomainGetGuestInfoCheckSupport(unsigned int types,
unsigned int *supportedTypes)
{ {
if (*types == 0) if (types == 0) {
*types = supportedGuestInfoTypes; *supportedTypes = qemuDomainGetGuestInfoSupportedTypes;
return 0;
}
*types = *types & supportedGuestInfoTypes; *supportedTypes = types & qemuDomainGetGuestInfoSupportedTypes;
if (types != *supportedTypes) {
virReportError(VIR_ERR_INVALID_ARG,
_("unsupported guest information types '0x%x'"),
types & ~qemuDomainGetGuestInfoSupportedTypes);
return -1;
}
return 0;
} }
static void static void
@ -22972,14 +22984,16 @@ qemuDomainGetGuestInfo(virDomainPtr dom,
int ret = -1; int ret = -1;
int maxparams = 0; int maxparams = 0;
g_autofree char *hostname = NULL; g_autofree char *hostname = NULL;
unsigned int supportedTypes = types; unsigned int supportedTypes;
int rc; int rc;
size_t nfs = 0; size_t nfs = 0;
qemuAgentFSInfoPtr *agentfsinfo = NULL; qemuAgentFSInfoPtr *agentfsinfo = NULL;
size_t i; size_t i;
virCheckFlags(0, -1); virCheckFlags(0, -1);
qemuDomainGetGuestInfoCheckSupport(&supportedTypes);
if (qemuDomainGetGuestInfoCheckSupport(types, &supportedTypes) < 0)
return -1;
if (!(vm = qemuDomainObjFromDomain(dom))) if (!(vm = qemuDomainObjFromDomain(dom)))
goto cleanup; goto cleanup;