NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

virsh: fix broken code in freepages

Browse Source 
Commit 9e3efe53 broke the build under valgrind or clang, by writing
8 bytes through an allocation of 4 bytes.  It also risks multiplication
overflow when mallocing (that's a pervasive problem that needs an
audit in the rest of the code, but we might as well fix this one while
we are here), and had a typo.

* tools/virsh-host.c (cmdFreepages): Avoid integer overflow and
undefined behavior.

Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Eric Blake 2014-06-19 09:21:08 -06:00
parent a341fc731d
commit 404bac14ab
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/virsh-host.c
View File

@ -1,7 +1,7 @@
/* /*
* virsh-host.c: Commands in "Host and Hypervisor" group. * virsh-host.c: Commands in "Host and Hypervisor" group.
* *
* Copyright (C) 2005, 2007-2012 Red Hat, Inc. * Copyright (C) 2005, 2007-2014 Red Hat, Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -214,7 +214,7 @@ static const vshCmdOptDef opts_freepages[] = {
}, },
{.name = "pagesize", {.name = "pagesize",
.type = VSH_OT_INT, .type = VSH_OT_INT,
.help = N_("page size (in kibibites)") .help = N_("page size (in kibibytes)")
}, },
{.name = "all", {.name = "all",
.type = VSH_OT_BOOL, .type = VSH_OT_BOOL,
@ -229,6 +229,7 @@ cmdFreepages(vshControl *ctl, const vshCmd *cmd)
bool ret = false; bool ret = false;
unsigned int npages; unsigned int npages;
unsigned int *pagesize = NULL; unsigned int *pagesize = NULL;
unsigned long long tmp;
int cell; int cell;
unsigned long long *counts = NULL; unsigned long long *counts = NULL;
size_t i, j; size_t i, j;
@ -261,7 +262,7 @@ cmdFreepages(vshControl *ctl, const vshCmd *cmd)
goto cleanup; goto cleanup;
} }
pagesize = vshMalloc(ctl, nodes_cnt * sizeof(*pagesize)); pagesize = vshCalloc(ctl, nodes_cnt, sizeof(*pagesize));
for (i = 0; i < nodes_cnt; i++) { for (i = 0; i < nodes_cnt; i++) {
char *val = virXMLPropString(nodes[i], "size"); char *val = virXMLPropString(nodes[i], "size");
@ -278,7 +279,7 @@ cmdFreepages(vshControl *ctl, const vshCmd *cmd)
npages = nodes_cnt; npages = nodes_cnt;
VIR_FREE(nodes); VIR_FREE(nodes);
counts = vshMalloc(ctl, npages * sizeof(*counts)); counts = vshCalloc(ctl, npages, sizeof(*counts));
nodes_cnt = virXPathNodeSet("/capabilities/host/topology/cells/cell", nodes_cnt = virXPathNodeSet("/capabilities/host/topology/cells/cell",
ctxt, &nodes); ctxt, &nodes);
@ -319,15 +320,13 @@ cmdFreepages(vshControl *ctl, const vshCmd *cmd)
goto cleanup; goto cleanup;
} }
pagesize = vshMalloc(ctl, sizeof(*pagesize)); if (vshCommandOptScaledInt(cmd, "pagesize", &tmp, 1, UINT_MAX) < 0) {
if (vshCommandOptScaledInt(cmd, "pagesize", (unsigned long long *) pagesize,
1, UINT_MAX) < 0) {
vshError(ctl, "%s", _("page size has to be a number")); vshError(ctl, "%s", _("page size has to be a number"));
goto cleanup; goto cleanup;
} }
/* page size is expected in kibibytes */ /* page size is expected in kibibytes */
pagesize[0] /= 1024; pagesize = vshMalloc(ctl, sizeof(*pagesize));
*pagesize = tmp / 1024;
if (!pagesize[0]) { if (!pagesize[0]) {
vshError(ctl, "%s", _("page size must be at least 1KiB")); vshError(ctl, "%s", _("page size must be at least 1KiB"));