From a565e20b082fd349c51789c0c396c4e5c014722f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Tomko?= Date: Thu, 29 Nov 2012 11:23:06 +0100 Subject: [PATCH] virsh: use correct sizeof when allocating cpumap Found by coverity: Error: SIZEOF_MISMATCH (CWE-569): libvirt-0.10.2/tools/virsh-domain.c:4754: suspicious_sizeof: Passing argument "8UL /* sizeof (cpumap) */" to function "_vshCalloc(vshControl *, size_t, size_t, char const *, int)" and then casting the return value to "unsigned char *" is suspicious. Error: SIZEOF_MISMATCH (CWE-569): libvirt-0.10.2/tools/virsh-domain.c:4942: suspicious_sizeof: Passing argument "8UL /* sizeof (cpumap) */" to function "_vshCalloc(vshControl *, size_t, size_t, char const *, int)" and then casting the return value to "unsigned char *" is suspicious. (cherry picked from commit dc04b2a737c8c4240d0d412080ce798b977068a1) --- tools/virsh-domain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 123afdead3..545ebe26b6 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -4739,7 +4739,7 @@ cmdVcpuPin(vshControl *ctl, const vshCmd *cmd) /* Pin mode: pinning specified vcpu to specified physical cpus*/ - cpumap = vshCalloc(ctl, cpumaplen, sizeof(cpumap)); + cpumap = vshCalloc(ctl, cpumaplen, sizeof(*cpumap)); /* Parse cpulist */ cur = cpulist; if (*cur == 0) { @@ -4927,7 +4927,7 @@ cmdEmulatorPin(vshControl *ctl, const vshCmd *cmd) /* Pin mode: pinning emulator threads to specified physical cpus*/ - cpumap = vshCalloc(ctl, cpumaplen, sizeof(cpumap)); + cpumap = vshCalloc(ctl, cpumaplen, sizeof(*cpumap)); /* Parse cpulist */ cur = cpulist; if (*cur == 0) {