External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-09-09 17:24:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

More paranoid initialization of 'nparams' variable in dispatch code

Browse Source 
Since the 'nparams' variable passed to virTypedParametersFree is
supposed to represent the size of the 'params' array, it is bad
practice to initialize it to a non-zero value, until the array
has been allocated.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2013-05-02 12:36:53 +01:00
parent 31dbbb667f
commit 329b7602a1
1 changed files with 44 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
daemon/remote.c
View File

@ -1000,7 +1000,7 @@ remoteDispatchDomainGetSchedulerParameters(virNetServerPtr server ATTRIBUTE_UNUS
{ {
virDomainPtr dom = NULL; virDomainPtr dom = NULL;
virTypedParameterPtr params = NULL; virTypedParameterPtr params = NULL;
int nparams = args->nparams; int nparams = 0;
int rv = -1; int rv = -1;
struct daemonClientPrivate *priv = struct daemonClientPrivate *priv =
virNetServerClientGetPrivateData(client); virNetServerClientGetPrivateData(client);
@ -1010,12 +1010,13 @@ remoteDispatchDomainGetSchedulerParameters(virNetServerPtr server ATTRIBUTE_UNUS
goto cleanup; goto cleanup;
} }
if (nparams > REMOTE_DOMAIN_SCHEDULER_PARAMETERS_MAX) { if (args->nparams > REMOTE_DOMAIN_SCHEDULER_PARAMETERS_MAX) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large")); virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large"));
goto cleanup; goto cleanup;
} }
if (nparams && VIR_ALLOC_N(params, nparams) < 0) if (args->nparams && VIR_ALLOC_N(params, args->nparams) < 0)
goto no_memory; goto no_memory;
nparams = args->nparams;
if (!(dom = get_nonnull_domain(priv->conn, args->dom))) if (!(dom = get_nonnull_domain(priv->conn, args->dom)))
goto cleanup; goto cleanup;
@ -1108,7 +1109,7 @@ remoteDispatchDomainGetSchedulerParametersFlags(virNetServerPtr server ATTRIBUTE
{ {
virDomainPtr dom = NULL; virDomainPtr dom = NULL;
virTypedParameterPtr params = NULL; virTypedParameterPtr params = NULL;
int nparams = args->nparams; int nparams = 0;
int rv = -1; int rv = -1;
struct daemonClientPrivate *priv = struct daemonClientPrivate *priv =
virNetServerClientGetPrivateData(client); virNetServerClientGetPrivateData(client);
@ -1118,12 +1119,13 @@ remoteDispatchDomainGetSchedulerParametersFlags(virNetServerPtr server ATTRIBUTE
goto cleanup; goto cleanup;
} }
if (nparams > REMOTE_DOMAIN_SCHEDULER_PARAMETERS_MAX) { if (args->nparams > REMOTE_DOMAIN_SCHEDULER_PARAMETERS_MAX) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large")); virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large"));
goto cleanup; goto cleanup;
} }
if (nparams && VIR_ALLOC_N(params, nparams) < 0) if (args->nparams && VIR_ALLOC_N(params, args->nparams) < 0)
goto no_memory; goto no_memory;
nparams = args->nparams;
if (!(dom = get_nonnull_domain(priv->conn, args->dom))) if (!(dom = get_nonnull_domain(priv->conn, args->dom)))
goto cleanup; goto cleanup;
@ -1283,7 +1285,7 @@ remoteDispatchDomainBlockStatsFlags(virNetServerPtr server ATTRIBUTE_UNUSED,
virTypedParameterPtr params = NULL; virTypedParameterPtr params = NULL;
virDomainPtr dom = NULL; virDomainPtr dom = NULL;
const char *path = args->path; const char *path = args->path;
int nparams = args->nparams; int nparams = 0;
unsigned int flags; unsigned int flags;
int rv = -1; int rv = -1;
struct daemonClientPrivate *priv = struct daemonClientPrivate *priv =
@ -1298,14 +1300,15 @@ remoteDispatchDomainBlockStatsFlags(virNetServerPtr server ATTRIBUTE_UNUSED,
goto cleanup; goto cleanup;
flags = args->flags; flags = args->flags;
if (nparams > REMOTE_DOMAIN_BLOCK_STATS_PARAMETERS_MAX) { if (args->nparams > REMOTE_DOMAIN_BLOCK_STATS_PARAMETERS_MAX) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large")); virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large"));
goto cleanup; goto cleanup;
} }
if (nparams && VIR_ALLOC_N(params, nparams) < 0) { if (args->nparams && VIR_ALLOC_N(params, args->nparams) < 0) {
virReportOOMError(); virReportOOMError();
goto cleanup; goto cleanup;
} }
nparams = args->nparams;
if (virDomainBlockStatsFlags(dom, path, params, &nparams, flags) < 0) if (virDomainBlockStatsFlags(dom, path, params, &nparams, flags) < 0)
goto cleanup; goto cleanup;
@ -1912,7 +1915,7 @@ remoteDispatchDomainGetMemoryParameters(virNetServerPtr server ATTRIBUTE_UNUSED,
{ {
virDomainPtr dom = NULL; virDomainPtr dom = NULL;
virTypedParameterPtr params = NULL; virTypedParameterPtr params = NULL;
int nparams = args->nparams; int nparams = 0;
unsigned int flags; unsigned int flags;
int rv = -1; int rv = -1;
struct daemonClientPrivate *priv = struct daemonClientPrivate *priv =
@ -1925,14 +1928,15 @@ remoteDispatchDomainGetMemoryParameters(virNetServerPtr server ATTRIBUTE_UNUSED,
flags = args->flags; flags = args->flags;
if (nparams > REMOTE_DOMAIN_MEMORY_PARAMETERS_MAX) { if (args->nparams > REMOTE_DOMAIN_MEMORY_PARAMETERS_MAX) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large")); virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large"));
goto cleanup; goto cleanup;
} }
if (nparams && VIR_ALLOC_N(params, nparams) < 0) { if (args->nparams && VIR_ALLOC_N(params, args->nparams) < 0) {
virReportOOMError(); virReportOOMError();
goto cleanup; goto cleanup;
} }
nparams = args->nparams;
if (!(dom = get_nonnull_domain(priv->conn, args->dom))) if (!(dom = get_nonnull_domain(priv->conn, args->dom)))
goto cleanup; goto cleanup;
@ -1976,7 +1980,7 @@ remoteDispatchDomainGetNumaParameters(virNetServerPtr server ATTRIBUTE_UNUSED,
{ {
virDomainPtr dom = NULL; virDomainPtr dom = NULL;
virTypedParameterPtr params = NULL; virTypedParameterPtr params = NULL;
int nparams = args->nparams; int nparams = 0;
unsigned int flags; unsigned int flags;
int rv = -1; int rv = -1;
struct daemonClientPrivate *priv = struct daemonClientPrivate *priv =
@ -1989,14 +1993,15 @@ remoteDispatchDomainGetNumaParameters(virNetServerPtr server ATTRIBUTE_UNUSED,
flags = args->flags; flags = args->flags;
if (nparams > REMOTE_DOMAIN_NUMA_PARAMETERS_MAX) { if (args->nparams > REMOTE_DOMAIN_NUMA_PARAMETERS_MAX) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large")); virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large"));
goto cleanup; goto cleanup;
} }
if (nparams && VIR_ALLOC_N(params, nparams) < 0) { if (args->nparams && VIR_ALLOC_N(params, args->nparams) < 0) {
virReportOOMError(); virReportOOMError();
goto cleanup; goto cleanup;
} }
nparams = args->nparams;
if (!(dom = get_nonnull_domain(priv->conn, args->dom))) if (!(dom = get_nonnull_domain(priv->conn, args->dom)))
goto cleanup; goto cleanup;
@ -2040,7 +2045,7 @@ remoteDispatchDomainGetBlkioParameters(virNetServerPtr server ATTRIBUTE_UNUSED,
{ {
virDomainPtr dom = NULL; virDomainPtr dom = NULL;
virTypedParameterPtr params = NULL; virTypedParameterPtr params = NULL;
int nparams = args->nparams; int nparams = 0;
unsigned int flags; unsigned int flags;
int rv = -1; int rv = -1;
struct daemonClientPrivate *priv = struct daemonClientPrivate *priv =
@ -2053,14 +2058,15 @@ remoteDispatchDomainGetBlkioParameters(virNetServerPtr server ATTRIBUTE_UNUSED,
flags = args->flags; flags = args->flags;
if (nparams > REMOTE_DOMAIN_BLKIO_PARAMETERS_MAX) { if (args->nparams > REMOTE_DOMAIN_BLKIO_PARAMETERS_MAX) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large")); virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large"));
goto cleanup; goto cleanup;
} }
if (nparams && VIR_ALLOC_N(params, nparams) < 0) { if (args->nparams && VIR_ALLOC_N(params, args->nparams) < 0) {
virReportOOMError(); virReportOOMError();
goto cleanup; goto cleanup;
} }
nparams = args->nparams;
if (!(dom = get_nonnull_domain(priv->conn, args->dom))) if (!(dom = get_nonnull_domain(priv->conn, args->dom)))
goto cleanup; goto cleanup;
@ -2105,7 +2111,7 @@ remoteDispatchNodeGetCPUStats(virNetServerPtr server ATTRIBUTE_UNUSED,
virNodeCPUStatsPtr params = NULL; virNodeCPUStatsPtr params = NULL;
int i; int i;
int cpuNum = args->cpuNum; int cpuNum = args->cpuNum;
int nparams = args->nparams; int nparams = 0;
unsigned int flags; unsigned int flags;
int rv = -1; int rv = -1;
struct daemonClientPrivate *priv = struct daemonClientPrivate *priv =
@ -2118,14 +2124,15 @@ remoteDispatchNodeGetCPUStats(virNetServerPtr server ATTRIBUTE_UNUSED,
flags = args->flags; flags = args->flags;
if (nparams > REMOTE_NODE_CPU_STATS_MAX) { if (args->nparams > REMOTE_NODE_CPU_STATS_MAX) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large")); virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large"));
goto cleanup; goto cleanup;
} }
if (VIR_ALLOC_N(params, nparams) < 0) { if (args->nparams && VIR_ALLOC_N(params, args->nparams) < 0) {
virReportOOMError(); virReportOOMError();
goto cleanup; goto cleanup;
} }
nparams = args->nparams;
if (virNodeGetCPUStats(priv->conn, cpuNum, params, &nparams, flags) < 0) if (virNodeGetCPUStats(priv->conn, cpuNum, params, &nparams, flags) < 0)
goto cleanup; goto cleanup;
@ -2183,7 +2190,7 @@ remoteDispatchNodeGetMemoryStats(virNetServerPtr server ATTRIBUTE_UNUSED,
virNodeMemoryStatsPtr params = NULL; virNodeMemoryStatsPtr params = NULL;
int i; int i;
int cellNum = args->cellNum; int cellNum = args->cellNum;
int nparams = args->nparams; int nparams = 0;
unsigned int flags; unsigned int flags;
int rv = -1; int rv = -1;
struct daemonClientPrivate *priv = struct daemonClientPrivate *priv =
@ -2196,14 +2203,15 @@ remoteDispatchNodeGetMemoryStats(virNetServerPtr server ATTRIBUTE_UNUSED,
flags = args->flags; flags = args->flags;
if (nparams > REMOTE_NODE_MEMORY_STATS_MAX) { if (args->nparams > REMOTE_NODE_MEMORY_STATS_MAX) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large")); virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large"));
goto cleanup; goto cleanup;
} }
if (VIR_ALLOC_N(params, nparams) < 0) { if (args->nparams && VIR_ALLOC_N(params, args->nparams) < 0) {
virReportOOMError(); virReportOOMError();
goto cleanup; goto cleanup;
} }
nparams = args->nparams;
if (virNodeGetMemoryStats(priv->conn, cellNum, params, &nparams, flags) < 0) if (virNodeGetMemoryStats(priv->conn, cellNum, params, &nparams, flags) < 0)
goto cleanup; goto cleanup;
@ -2302,7 +2310,7 @@ remoteDispatchDomainGetBlockIoTune(virNetServerPtr server ATTRIBUTE_UNUSED,
virDomainPtr dom = NULL; virDomainPtr dom = NULL;
int rv = -1; int rv = -1;
virTypedParameterPtr params = NULL; virTypedParameterPtr params = NULL;
int nparams = args->nparams; int nparams = 0;
struct daemonClientPrivate *priv = struct daemonClientPrivate *priv =
virNetServerClientGetPrivateData(client); virNetServerClientGetPrivateData(client);
@ -2311,15 +2319,16 @@ remoteDispatchDomainGetBlockIoTune(virNetServerPtr server ATTRIBUTE_UNUSED,
goto cleanup; goto cleanup;
} }
if (nparams > REMOTE_DOMAIN_BLOCK_IO_TUNE_PARAMETERS_MAX) { if (args->nparams > REMOTE_DOMAIN_BLOCK_IO_TUNE_PARAMETERS_MAX) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large")); virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large"));
goto cleanup; goto cleanup;
} }
if (nparams && VIR_ALLOC_N(params, nparams) < 0) { if (args->nparams && VIR_ALLOC_N(params, args->nparams) < 0) {
virReportOOMError(); virReportOOMError();
goto cleanup; goto cleanup;
} }
nparams = args->nparams;
if (!(dom = get_nonnull_domain(priv->conn, args->dom))) if (!(dom = get_nonnull_domain(priv->conn, args->dom)))
goto cleanup; goto cleanup;
@ -3799,7 +3808,7 @@ remoteDispatchDomainGetInterfaceParameters(virNetServerPtr server ATTRIBUTE_UNUS
virDomainPtr dom = NULL; virDomainPtr dom = NULL;
virTypedParameterPtr params = NULL; virTypedParameterPtr params = NULL;
const char *device = args->device; const char *device = args->device;
int nparams = args->nparams; int nparams = 0;
unsigned int flags; unsigned int flags;
int rv = -1; int rv = -1;
struct daemonClientPrivate *priv = struct daemonClientPrivate *priv =
@ -3812,14 +3821,15 @@ remoteDispatchDomainGetInterfaceParameters(virNetServerPtr server ATTRIBUTE_UNUS
flags = args->flags; flags = args->flags;
if (nparams > REMOTE_DOMAIN_INTERFACE_PARAMETERS_MAX) { if (args->nparams > REMOTE_DOMAIN_INTERFACE_PARAMETERS_MAX) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large")); virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large"));
goto cleanup; goto cleanup;
} }
if (nparams && VIR_ALLOC_N(params, nparams) < 0) { if (args->nparams && VIR_ALLOC_N(params, args->nparams) < 0) {
virReportOOMError(); virReportOOMError();
goto cleanup; goto cleanup;
} }
nparams = args->nparams;
if (!(dom = get_nonnull_domain(priv->conn, args->dom))) if (!(dom = get_nonnull_domain(priv->conn, args->dom)))
goto cleanup; goto cleanup;
@ -4507,7 +4517,7 @@ remoteDispatchNodeGetMemoryParameters(virNetServerPtr server ATTRIBUTE_UNUSED,
remote_node_get_memory_parameters_ret *ret) remote_node_get_memory_parameters_ret *ret)
{ {
virTypedParameterPtr params = NULL; virTypedParameterPtr params = NULL;
int nparams = args->nparams; int nparams = 0;
unsigned int flags; unsigned int flags;
int rv = -1; int rv = -1;
struct daemonClientPrivate *priv = struct daemonClientPrivate *priv =
@ -4520,15 +4530,15 @@ remoteDispatchNodeGetMemoryParameters(virNetServerPtr server ATTRIBUTE_UNUSED,
flags = args->flags; flags = args->flags;
if (nparams > REMOTE_NODE_MEMORY_PARAMETERS_MAX) { if (args->nparams > REMOTE_NODE_MEMORY_PARAMETERS_MAX) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large")); virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large"));
goto cleanup; goto cleanup;
} }
if (nparams && VIR_ALLOC_N(params, nparams) < 0) { if (args->nparams && VIR_ALLOC_N(params, args->nparams) < 0) {
virReportOOMError(); virReportOOMError();
goto cleanup; goto cleanup;
} }
nparams = args->nparams;
if (virNodeGetMemoryParameters(priv->conn, params, &nparams, flags) < 0) if (virNodeGetMemoryParameters(priv->conn, params, &nparams, flags) < 0)
goto cleanup; goto cleanup;