External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

conf: Add several cleanup paths

Browse Source 
In many cases, an early exit from a function would cause
memory allocated by local virBuffer instances not to be
released.

Provide proper cleanup paths to solve the issue.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Andrea Bolognani 2018-11-16 16:08:03 +01:00
parent 9f4abfa601
commit c3a208af0d
1 changed files with 100 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

137
src/conf/domain_conf.c
View File

@ -24353,13 +24353,14 @@ virDomainControllerDefFormat(virBufferPtr buf,
const char *model = NULL; const char *model = NULL;
const char *modelName = NULL; const char *modelName = NULL;
virBuffer childBuf = VIR_BUFFER_INITIALIZER; virBuffer childBuf = VIR_BUFFER_INITIALIZER;
int ret = -1;
virBufferSetChildIndent(&childBuf, buf); virBufferSetChildIndent(&childBuf, buf);
if (!type) { if (!type) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("unexpected controller type %d"), def->type); _("unexpected controller type %d"), def->type);
return -1; goto cleanup;
} }
if (def->model != -1) { if (def->model != -1) {
@ -24368,7 +24369,7 @@ virDomainControllerDefFormat(virBufferPtr buf,
if (!model) { if (!model) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("unexpected model type %d"), def->model); _("unexpected model type %d"), def->model);
return -1; goto cleanup;
} }
} }
@ -24432,7 +24433,7 @@ virDomainControllerDefFormat(virBufferPtr buf,
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("unexpected model name value %d"), _("unexpected model name value %d"),
def->opts.pciopts.modelName); def->opts.pciopts.modelName);
return -1; goto cleanup;
} }
virBufferAsprintf(&childBuf, "<model name='%s'/>\n", modelName); virBufferAsprintf(&childBuf, "<model name='%s'/>\n", modelName);
} }
@ -24483,7 +24484,7 @@ virDomainControllerDefFormat(virBufferPtr buf,
} }
if (virBufferCheckError(&childBuf) < 0) if (virBufferCheckError(&childBuf) < 0)
return -1; goto cleanup;
if (virBufferUse(&childBuf)) { if (virBufferUse(&childBuf)) {
virBufferAddLit(buf, ">\n"); virBufferAddLit(buf, ">\n");
@ -24493,6 +24494,11 @@ virDomainControllerDefFormat(virBufferPtr buf,
virBufferAddLit(buf, "/>\n"); virBufferAddLit(buf, "/>\n");
} }
ret = 0;
cleanup:
virBufferFreeAndReset(&childBuf);
return 0; return 0;
} }
@ -24523,17 +24529,18 @@ virDomainFSDefFormat(virBufferPtr buf,
const char *wrpolicy = virDomainFSWrpolicyTypeToString(def->wrpolicy); const char *wrpolicy = virDomainFSWrpolicyTypeToString(def->wrpolicy);
const char *src = def->src->path; const char *src = def->src->path;
virBuffer driverBuf = VIR_BUFFER_INITIALIZER; virBuffer driverBuf = VIR_BUFFER_INITIALIZER;
int ret = -1;
if (!type) { if (!type) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("unexpected filesystem type %d"), def->type); _("unexpected filesystem type %d"), def->type);
return -1; goto cleanup;
} }
if (!accessmode) { if (!accessmode) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("unexpected accessmode %d"), def->accessmode); _("unexpected accessmode %d"), def->accessmode);
return -1; goto cleanup;
} }
@ -24557,7 +24564,7 @@ virDomainFSDefFormat(virBufferPtr buf,
virDomainVirtioOptionsFormat(&driverBuf, def->virtio); virDomainVirtioOptionsFormat(&driverBuf, def->virtio);
if (virBufferCheckError(&driverBuf) < 0) if (virBufferCheckError(&driverBuf) < 0)
return -1; goto cleanup;
if (virBufferUse(&driverBuf)) { if (virBufferUse(&driverBuf)) {
virBufferAddLit(buf, "<driver"); virBufferAddLit(buf, "<driver");
@ -24617,7 +24624,13 @@ virDomainFSDefFormat(virBufferPtr buf,
} }
virBufferAdjustIndent(buf, -2); virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</filesystem>\n"); virBufferAddLit(buf, "</filesystem>\n");
return 0;
ret = 0;
cleanup:
virBufferFreeAndReset(&driverBuf);
return ret;
} }
@ -25847,13 +25860,14 @@ virDomainSoundDefFormat(virBufferPtr buf,
const char *model = virDomainSoundModelTypeToString(def->model); const char *model = virDomainSoundModelTypeToString(def->model);
virBuffer childBuf = VIR_BUFFER_INITIALIZER; virBuffer childBuf = VIR_BUFFER_INITIALIZER;
size_t i; size_t i;
int ret = -1;
virBufferSetChildIndent(&childBuf, buf); virBufferSetChildIndent(&childBuf, buf);
if (!model) { if (!model) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("unexpected sound model %d"), def->model); _("unexpected sound model %d"), def->model);
return -1; goto cleanup;
} }
for (i = 0; i < def->ncodecs; i++) for (i = 0; i < def->ncodecs; i++)
@ -25862,7 +25876,7 @@ virDomainSoundDefFormat(virBufferPtr buf,
virDomainDeviceInfoFormat(&childBuf, &def->info, flags); virDomainDeviceInfoFormat(&childBuf, &def->info, flags);
if (virBufferCheckError(&childBuf) < 0) if (virBufferCheckError(&childBuf) < 0)
return -1; goto cleanup;
virBufferAsprintf(buf, "<sound model='%s'", model); virBufferAsprintf(buf, "<sound model='%s'", model);
if (virBufferUse(&childBuf)) { if (virBufferUse(&childBuf)) {
@ -25873,6 +25887,11 @@ virDomainSoundDefFormat(virBufferPtr buf,
virBufferAddLit(buf, "/>\n"); virBufferAddLit(buf, "/>\n");
} }
ret = 0;
cleanup:
virBufferFreeAndReset(&childBuf);
return 0; return 0;
} }
@ -25884,11 +25903,12 @@ virDomainMemballoonDefFormat(virBufferPtr buf,
{ {
const char *model = virDomainMemballoonModelTypeToString(def->model); const char *model = virDomainMemballoonModelTypeToString(def->model);
virBuffer childrenBuf = VIR_BUFFER_INITIALIZER; virBuffer childrenBuf = VIR_BUFFER_INITIALIZER;
int ret = -1;
if (!model) { if (!model) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("unexpected memballoon model %d"), def->model); _("unexpected memballoon model %d"), def->model);
return -1; goto cleanup;
} }
virBufferAsprintf(buf, "<memballoon model='%s'", model); virBufferAsprintf(buf, "<memballoon model='%s'", model);
@ -25909,10 +25929,9 @@ virDomainMemballoonDefFormat(virBufferPtr buf,
virDomainVirtioOptionsFormat(&driverBuf, def->virtio); virDomainVirtioOptionsFormat(&driverBuf, def->virtio);
if (virBufferCheckError(&driverBuf) < 0) { if (virBufferCheckError(&driverBuf) < 0)
virBufferFreeAndReset(&childrenBuf); goto cleanup;
return -1;
}
if (virBufferUse(&driverBuf)) { if (virBufferUse(&driverBuf)) {
virBufferAddLit(&childrenBuf, "<driver"); virBufferAddLit(&childrenBuf, "<driver");
virBufferAddBuffer(&childrenBuf, &driverBuf); virBufferAddBuffer(&childrenBuf, &driverBuf);
@ -25921,7 +25940,7 @@ virDomainMemballoonDefFormat(virBufferPtr buf,
} }
if (virBufferCheckError(&childrenBuf) < 0) if (virBufferCheckError(&childrenBuf) < 0)
return -1; goto cleanup;
if (!virBufferUse(&childrenBuf)) { if (!virBufferUse(&childrenBuf)) {
virBufferAddLit(buf, "/>\n"); virBufferAddLit(buf, "/>\n");
@ -25931,6 +25950,11 @@ virDomainMemballoonDefFormat(virBufferPtr buf,
virBufferAddLit(buf, "</memballoon>\n"); virBufferAddLit(buf, "</memballoon>\n");
} }
ret = 0;
cleanup:
virBufferFreeAndReset(&childrenBuf);
return 0; return 0;
} }
@ -25958,25 +25982,26 @@ virDomainWatchdogDefFormat(virBufferPtr buf,
const char *model = virDomainWatchdogModelTypeToString(def->model); const char *model = virDomainWatchdogModelTypeToString(def->model);
const char *action = virDomainWatchdogActionTypeToString(def->action); const char *action = virDomainWatchdogActionTypeToString(def->action);
virBuffer childBuf = VIR_BUFFER_INITIALIZER; virBuffer childBuf = VIR_BUFFER_INITIALIZER;
int ret = -1;
virBufferSetChildIndent(&childBuf, buf); virBufferSetChildIndent(&childBuf, buf);
if (!model) { if (!model) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("unexpected watchdog model %d"), def->model); _("unexpected watchdog model %d"), def->model);
return -1; goto cleanup;
} }
if (!action) { if (!action) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("unexpected watchdog action %d"), def->action); _("unexpected watchdog action %d"), def->action);
return -1; goto cleanup;
} }
virDomainDeviceInfoFormat(&childBuf, &def->info, flags); virDomainDeviceInfoFormat(&childBuf, &def->info, flags);
if (virBufferCheckError(&childBuf) < 0) if (virBufferCheckError(&childBuf) < 0)
return -1; goto cleanup;
virBufferAsprintf(buf, "<watchdog model='%s' action='%s'", virBufferAsprintf(buf, "<watchdog model='%s' action='%s'",
model, action); model, action);
@ -25989,13 +26014,19 @@ virDomainWatchdogDefFormat(virBufferPtr buf,
virBufferAddLit(buf, "/>\n"); virBufferAddLit(buf, "/>\n");
} }
return 0; ret = 0;
cleanup:
virBufferFreeAndReset(&childBuf);
return ret;
} }
static int virDomainPanicDefFormat(virBufferPtr buf, static int virDomainPanicDefFormat(virBufferPtr buf,
virDomainPanicDefPtr def) virDomainPanicDefPtr def)
{ {
virBuffer childrenBuf = VIR_BUFFER_INITIALIZER; virBuffer childrenBuf = VIR_BUFFER_INITIALIZER;
int ret = -1;
virBufferAddLit(buf, "<panic"); virBufferAddLit(buf, "<panic");
@ -26007,7 +26038,7 @@ static int virDomainPanicDefFormat(virBufferPtr buf,
virDomainDeviceInfoFormat(&childrenBuf, &def->info, 0); virDomainDeviceInfoFormat(&childrenBuf, &def->info, 0);
if (virBufferCheckError(&childrenBuf) < 0) if (virBufferCheckError(&childrenBuf) < 0)
return -1; goto cleanup;
if (virBufferUse(&childrenBuf)) { if (virBufferUse(&childrenBuf)) {
virBufferAddLit(buf, ">\n"); virBufferAddLit(buf, ">\n");
@ -26016,8 +26047,13 @@ static int virDomainPanicDefFormat(virBufferPtr buf,
} else { } else {
virBufferAddLit(buf, "/>\n"); virBufferAddLit(buf, "/>\n");
} }
ret = 0;
cleanup:
virBufferFreeAndReset(&childrenBuf); virBufferFreeAndReset(&childrenBuf);
return 0;
return ret;
} }
static int static int
@ -26067,6 +26103,7 @@ virDomainRNGDefFormat(virBufferPtr buf,
const char *model = virDomainRNGModelTypeToString(def->model); const char *model = virDomainRNGModelTypeToString(def->model);
const char *backend = virDomainRNGBackendTypeToString(def->backend); const char *backend = virDomainRNGBackendTypeToString(def->backend);
virBuffer driverBuf = VIR_BUFFER_INITIALIZER; virBuffer driverBuf = VIR_BUFFER_INITIALIZER;
int ret = -1;
virBufferAsprintf(buf, "<rng model='%s'>\n", model); virBufferAsprintf(buf, "<rng model='%s'>\n", model);
virBufferAdjustIndent(buf, 2); virBufferAdjustIndent(buf, 2);
@ -26085,11 +26122,11 @@ virDomainRNGDefFormat(virBufferPtr buf,
case VIR_DOMAIN_RNG_BACKEND_EGD: case VIR_DOMAIN_RNG_BACKEND_EGD:
if (virDomainChrAttrsDefFormat(buf, def->source.chardev, false) < 0) if (virDomainChrAttrsDefFormat(buf, def->source.chardev, false) < 0)
return -1; goto cleanup;
virBufferAddLit(buf, ">\n"); virBufferAddLit(buf, ">\n");
virBufferAdjustIndent(buf, 2); virBufferAdjustIndent(buf, 2);
if (virDomainChrSourceDefFormat(buf, def->source.chardev, flags) < 0) if (virDomainChrSourceDefFormat(buf, def->source.chardev, flags) < 0)
return -1; goto cleanup;
virBufferAdjustIndent(buf, -2); virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</backend>\n"); virBufferAddLit(buf, "</backend>\n");
@ -26099,7 +26136,7 @@ virDomainRNGDefFormat(virBufferPtr buf,
virDomainVirtioOptionsFormat(&driverBuf, def->virtio); virDomainVirtioOptionsFormat(&driverBuf, def->virtio);
if (virBufferCheckError(&driverBuf) < 0) if (virBufferCheckError(&driverBuf) < 0)
return -1; goto cleanup;
if (virBufferUse(&driverBuf)) { if (virBufferUse(&driverBuf)) {
virBufferAddLit(buf, "<driver"); virBufferAddLit(buf, "<driver");
@ -26111,7 +26148,13 @@ virDomainRNGDefFormat(virBufferPtr buf,
virBufferAdjustIndent(buf, -2); virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</rng>\n"); virBufferAddLit(buf, "</rng>\n");
return 0;
ret = 0;
cleanup:
virBufferFreeAndReset(&driverBuf);
return ret;
} }
void void
@ -26258,18 +26301,19 @@ virDomainVideoDefFormat(virBufferPtr buf,
{ {
const char *model = virDomainVideoTypeToString(def->type); const char *model = virDomainVideoTypeToString(def->type);
virBuffer driverBuf = VIR_BUFFER_INITIALIZER; virBuffer driverBuf = VIR_BUFFER_INITIALIZER;
int ret = -1;
if (!model) { if (!model) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("unexpected video model %d"), def->type); _("unexpected video model %d"), def->type);
return -1; goto cleanup;
} }
virBufferAddLit(buf, "<video>\n"); virBufferAddLit(buf, "<video>\n");
virBufferAdjustIndent(buf, 2); virBufferAdjustIndent(buf, 2);
virDomainVirtioOptionsFormat(&driverBuf, def->virtio); virDomainVirtioOptionsFormat(&driverBuf, def->virtio);
if (virBufferCheckError(&driverBuf) < 0) if (virBufferCheckError(&driverBuf) < 0)
return -1; goto cleanup;
if (virBufferUse(&driverBuf) || (def->driver && def->driver->vgaconf)) { if (virBufferUse(&driverBuf) || (def->driver && def->driver->vgaconf)) {
virBufferAddLit(buf, "<driver"); virBufferAddLit(buf, "<driver");
if (virBufferUse(&driverBuf)) if (virBufferUse(&driverBuf))
@ -26308,7 +26352,13 @@ virDomainVideoDefFormat(virBufferPtr buf,
virBufferAdjustIndent(buf, -2); virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</video>\n"); virBufferAddLit(buf, "</video>\n");
return 0;
ret = 0;
cleanup:
virBufferFreeAndReset(&driverBuf);
return ret;
} }
static int static int
@ -26320,6 +26370,7 @@ virDomainInputDefFormat(virBufferPtr buf,
const char *bus = virDomainInputBusTypeToString(def->bus); const char *bus = virDomainInputBusTypeToString(def->bus);
virBuffer childbuf = VIR_BUFFER_INITIALIZER; virBuffer childbuf = VIR_BUFFER_INITIALIZER;
virBuffer driverBuf = VIR_BUFFER_INITIALIZER; virBuffer driverBuf = VIR_BUFFER_INITIALIZER;
int ret = -1;
/* don't format keyboard into migratable XML for backward compatibility */ /* don't format keyboard into migratable XML for backward compatibility */
if (flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE && if (flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE &&
@ -26331,12 +26382,12 @@ virDomainInputDefFormat(virBufferPtr buf,
if (!type) { if (!type) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("unexpected input type %d"), def->type); _("unexpected input type %d"), def->type);
return -1; goto cleanup;
} }
if (!bus) { if (!bus) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("unexpected input bus type %d"), def->bus); _("unexpected input bus type %d"), def->bus);
return -1; goto cleanup;
} }
virBufferAsprintf(buf, "<input type='%s' bus='%s'", virBufferAsprintf(buf, "<input type='%s' bus='%s'",
@ -26345,7 +26396,7 @@ virDomainInputDefFormat(virBufferPtr buf,
virBufferSetChildIndent(&childbuf, buf); virBufferSetChildIndent(&childbuf, buf);
virDomainVirtioOptionsFormat(&driverBuf, def->virtio); virDomainVirtioOptionsFormat(&driverBuf, def->virtio);
if (virBufferCheckError(&driverBuf) < 0) if (virBufferCheckError(&driverBuf) < 0)
return -1; goto cleanup;
if (virBufferUse(&driverBuf)) { if (virBufferUse(&driverBuf)) {
virBufferAddLit(&childbuf, "<driver"); virBufferAddLit(&childbuf, "<driver");
@ -26356,7 +26407,7 @@ virDomainInputDefFormat(virBufferPtr buf,
virDomainDeviceInfoFormat(&childbuf, &def->info, flags); virDomainDeviceInfoFormat(&childbuf, &def->info, flags);
if (virBufferCheckError(&childbuf) < 0) if (virBufferCheckError(&childbuf) < 0)
return -1; goto cleanup;
if (!virBufferUse(&childbuf)) { if (!virBufferUse(&childbuf)) {
virBufferAddLit(buf, "/>\n"); virBufferAddLit(buf, "/>\n");
@ -26366,7 +26417,13 @@ virDomainInputDefFormat(virBufferPtr buf,
virBufferAddLit(buf, "</input>\n"); virBufferAddLit(buf, "</input>\n");
} }
return 0; ret = 0;
cleanup:
virBufferFreeAndReset(&childbuf);
virBufferFreeAndReset(&driverBuf);
return ret;
} }
@ -27028,19 +27085,20 @@ virDomainHubDefFormat(virBufferPtr buf,
{ {
const char *type = virDomainHubTypeToString(def->type); const char *type = virDomainHubTypeToString(def->type);
virBuffer childBuf = VIR_BUFFER_INITIALIZER; virBuffer childBuf = VIR_BUFFER_INITIALIZER;
int ret = -1;
virBufferSetChildIndent(&childBuf, buf); virBufferSetChildIndent(&childBuf, buf);
if (!type) { if (!type) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("unexpected hub type %d"), def->type); _("unexpected hub type %d"), def->type);
return -1; goto cleanup;
} }
virDomainDeviceInfoFormat(&childBuf, &def->info, flags); virDomainDeviceInfoFormat(&childBuf, &def->info, flags);
if (virBufferCheckError(&childBuf) < 0) if (virBufferCheckError(&childBuf) < 0)
return -1; goto cleanup;
virBufferAsprintf(buf, "<hub type='%s'", type); virBufferAsprintf(buf, "<hub type='%s'", type);
if (virBufferUse(&childBuf)) { if (virBufferUse(&childBuf)) {
@ -27051,7 +27109,12 @@ virDomainHubDefFormat(virBufferPtr buf,
virBufferAddLit(buf, "/>\n"); virBufferAddLit(buf, "/>\n");
} }
return 0; ret = 0;
cleanup:
virBufferFreeAndReset(&childBuf);
return ret;
} }