openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

virQEMUDriverConfigLoadSecurityEntry: use VIR_AUTOFREE 

Switch the function to use VIR_AUTOFREE and VIR_AUTOPTR macros
to get rid of the cleanup section.

Requested-by: John Ferlan <jferlan@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
This commit is contained in:
Ján Tomko 2019-01-21 14:48:18 +01:00
parent 2a33dc41bb
commit 784e690ecb
1 changed files with 23 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/qemu/qemu_conf.c
View File

@ -866,14 +866,14 @@ virQEMUDriverConfigLoadSecurityEntry(virQEMUDriverConfigPtr cfg,
virConfPtr conf, virConfPtr conf,
bool privileged) bool privileged)
{ {
char *user = NULL, *group = NULL; VIR_AUTOPTR(virString) controllers = NULL;
char **controllers = NULL; VIR_AUTOPTR(virString) namespaces = NULL;
char **namespaces = NULL; VIR_AUTOFREE(char *) user = NULL;
int ret = -1; VIR_AUTOFREE(char *) group = NULL;
size_t i, j; size_t i, j;
if (virConfGetValueStringList(conf, "security_driver", true, &cfg->securityDriverNames) < 0) if (virConfGetValueStringList(conf, "security_driver", true, &cfg->securityDriverNames) < 0)
goto cleanup; return -1;
for (i = 0; cfg->securityDriverNames && cfg->securityDriverNames[i] != NULL; i++) { for (i = 0; cfg->securityDriverNames && cfg->securityDriverNames[i] != NULL; i++) {
for (j = i + 1; cfg->securityDriverNames[j] != NULL; j++) { for (j = i + 1; cfg->securityDriverNames[j] != NULL; j++) {
@ -882,32 +882,32 @@ virQEMUDriverConfigLoadSecurityEntry(virQEMUDriverConfigPtr cfg,
virReportError(VIR_ERR_CONF_SYNTAX, virReportError(VIR_ERR_CONF_SYNTAX,
_("Duplicate security driver %s"), _("Duplicate security driver %s"),
cfg->securityDriverNames[i]); cfg->securityDriverNames[i]);
goto cleanup; return -1;
} }
} }
} }
if (virConfGetValueBool(conf, "security_default_confined", &cfg->securityDefaultConfined) < 0) if (virConfGetValueBool(conf, "security_default_confined", &cfg->securityDefaultConfined) < 0)
goto cleanup; return -1;
if (virConfGetValueBool(conf, "security_require_confined", &cfg->securityRequireConfined) < 0) if (virConfGetValueBool(conf, "security_require_confined", &cfg->securityRequireConfined) < 0)
goto cleanup; return -1;
if (virConfGetValueString(conf, "user", &user) < 0) if (virConfGetValueString(conf, "user", &user) < 0)
goto cleanup; return -1;
if (user && virGetUserID(user, &cfg->user) < 0) if (user && virGetUserID(user, &cfg->user) < 0)
goto cleanup; return -1;
if (virConfGetValueString(conf, "group", &group) < 0) if (virConfGetValueString(conf, "group", &group) < 0)
goto cleanup; return -1;
if (group && virGetGroupID(group, &cfg->group) < 0) if (group && virGetGroupID(group, &cfg->group) < 0)
goto cleanup; return -1;
if (virConfGetValueBool(conf, "dynamic_ownership", &cfg->dynamicOwnership) < 0) if (virConfGetValueBool(conf, "dynamic_ownership", &cfg->dynamicOwnership) < 0)
goto cleanup; return -1;
if (virConfGetValueStringList(conf, "cgroup_controllers", false, if (virConfGetValueStringList(conf, "cgroup_controllers", false,
&controllers) < 0) &controllers) < 0)
goto cleanup; return -1;
if (controllers) { if (controllers) {
cfg->cgroupControllers = 0; cfg->cgroupControllers = 0;
@ -917,7 +917,7 @@ virQEMUDriverConfigLoadSecurityEntry(virQEMUDriverConfigPtr cfg,
virReportError(VIR_ERR_CONF_SYNTAX, virReportError(VIR_ERR_CONF_SYNTAX,
_("Unknown cgroup controller '%s'"), _("Unknown cgroup controller '%s'"),
controllers[i]); controllers[i]);
goto cleanup; return -1;
} }
cfg->cgroupControllers |= (1 << ctl); cfg->cgroupControllers |= (1 << ctl);
} }
@ -925,13 +925,13 @@ virQEMUDriverConfigLoadSecurityEntry(virQEMUDriverConfigPtr cfg,
if (virConfGetValueStringList(conf, "cgroup_device_acl", false, if (virConfGetValueStringList(conf, "cgroup_device_acl", false,
&cfg->cgroupDeviceACL) < 0) &cfg->cgroupDeviceACL) < 0)
goto cleanup; return -1;
if (virConfGetValueInt(conf, "seccomp_sandbox", &cfg->seccompSandbox) < 0) if (virConfGetValueInt(conf, "seccomp_sandbox", &cfg->seccompSandbox) < 0)
goto cleanup; return -1;
if (virConfGetValueStringList(conf, "namespaces", false, &namespaces) < 0) if (virConfGetValueStringList(conf, "namespaces", false, &namespaces) < 0)
goto cleanup; return -1;
if (namespaces) { if (namespaces) {
virBitmapClearAll(cfg->namespaces); virBitmapClearAll(cfg->namespaces);
@ -943,38 +943,32 @@ virQEMUDriverConfigLoadSecurityEntry(virQEMUDriverConfigPtr cfg,
virReportError(VIR_ERR_CONF_SYNTAX, virReportError(VIR_ERR_CONF_SYNTAX,
_("Unknown namespace: %s"), _("Unknown namespace: %s"),
namespaces[i]); namespaces[i]);
goto cleanup; return -1;
} }
if (!privileged) { if (!privileged) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("cannot use namespaces in session mode")); _("cannot use namespaces in session mode"));
goto cleanup; return -1;
} }
if (!qemuDomainNamespaceAvailable(ns)) { if (!qemuDomainNamespaceAvailable(ns)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("%s namespace is not available"), _("%s namespace is not available"),
namespaces[i]); namespaces[i]);
goto cleanup; return -1;
} }
if (virBitmapSetBit(cfg->namespaces, ns) < 0) { if (virBitmapSetBit(cfg->namespaces, ns) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("Unable to enable namespace: %s"), _("Unable to enable namespace: %s"),
namespaces[i]); namespaces[i]);
goto cleanup; return -1;
} }
} }
} }
ret = 0; return 0;
cleanup:
virStringListFree(controllers);
virStringListFree(namespaces);
VIR_FREE(user);
VIR_FREE(group);
return ret;
} }