External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-11 15:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

AppArmor code cleanups

Browse Source 
* src/security/security_apparmor.c: a few code cleanups following a
  review on the list
This commit is contained in:
Jamie Strandboge 2009-11-13 15:27:43 +01:00 committed by Daniel Veillard
parent d0d4b8ad76
commit 3cbc05012d
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/security/security_apparmor.c
View File

@ -74,8 +74,6 @@ profile_status(const char *str, const int check_enforcing)
virReportSystemError(NULL, errno, virReportSystemError(NULL, errno,
_("Failed to read AppArmor profiles list " _("Failed to read AppArmor profiles list "
"\'%s\'"), APPARMOR_PROFILES_PATH); "\'%s\'"), APPARMOR_PROFILES_PATH);
if (check_enforcing != 0)
VIR_FREE(etmp);
goto clean; goto clean;
} }
@ -84,12 +82,12 @@ profile_status(const char *str, const int check_enforcing)
if (check_enforcing != 0) { if (check_enforcing != 0) {
if (rc == 0 && strstr(content, etmp) != NULL) if (rc == 0 && strstr(content, etmp) != NULL)
rc = 1; /* return '1' if loaded and enforcing */ rc = 1; /* return '1' if loaded and enforcing */
VIR_FREE(etmp);
} }
VIR_FREE(content); VIR_FREE(content);
clean: clean:
VIR_FREE(tmp); VIR_FREE(tmp);
VIR_FREE(etmp);
return rc; return rc;
} }
@ -107,32 +105,30 @@ profile_loaded(const char *str)
static int static int
profile_status_file(const char *str) profile_status_file(const char *str)
{ {
char profile[PATH_MAX]; char *profile = NULL;
char *content = NULL; char *content = NULL;
char *tmp = NULL; char *tmp = NULL;
int rc = -1; int rc = -1;
int len; int len;
if (snprintf(profile, PATH_MAX, "%s/%s", APPARMOR_DIR "/libvirt", str) if (virAsprintf(&profile, "%s/%s", APPARMOR_DIR "/libvirt", str) == -1) {
> PATH_MAX - 1) { virReportOOMError(NULL);
virSecurityReportError(NULL, VIR_ERR_INTERNAL_ERROR,
"%s", _("profile name exceeds maximum length"));
}
if (!virFileExists(profile)) {
return rc; return rc;
} }
if (!virFileExists(profile))
goto failed;
if ((len = virFileReadAll(profile, MAX_FILE_LEN, &content)) < 0) { if ((len = virFileReadAll(profile, MAX_FILE_LEN, &content)) < 0) {
virReportSystemError(NULL, errno, virReportSystemError(NULL, errno,
_("Failed to read \'%s\'"), profile); _("Failed to read \'%s\'"), profile);
return rc; goto failed;
} }
/* create string that is ' <str> flags=(complain)\0' */ /* create string that is ' <str> flags=(complain)\0' */
if (virAsprintf(&tmp, " %s flags=(complain)", str) == -1) { if (virAsprintf(&tmp, " %s flags=(complain)", str) == -1) {
virReportOOMError(NULL); virReportOOMError(NULL);
goto clean; goto failed;
} }
if (strstr(content, tmp) != NULL) if (strstr(content, tmp) != NULL)
@ -140,8 +136,9 @@ profile_status_file(const char *str)
else else
rc = 1; rc = 1;
failed:
VIR_FREE(tmp); VIR_FREE(tmp);
clean: VIR_FREE(profile);
VIR_FREE(content); VIR_FREE(content);
return rc; return rc;
@ -167,7 +164,7 @@ load_profile(virConnectPtr conn, const char *profile, virDomainObjPtr vm,
xml = virDomainDefFormat(conn, vm->def, VIR_DOMAIN_XML_SECURE); xml = virDomainDefFormat(conn, vm->def, VIR_DOMAIN_XML_SECURE);
if (!xml) if (!xml)
goto failed; goto clean;
if (profile_status_file(profile) >= 0) if (profile_status_file(profile) >= 0)
create = false; create = false;
@ -217,7 +214,6 @@ load_profile(virConnectPtr conn, const char *profile, virDomainObjPtr vm,
clean: clean:
VIR_FREE(xml); VIR_FREE(xml);
failed:
if (pipefd[0] > 0) if (pipefd[0] > 0)
close(pipefd[0]); close(pipefd[0]);
if (pipefd[1] > 0) if (pipefd[1] > 0)
@ -284,26 +280,30 @@ use_apparmor(void)
static int static int
AppArmorSecurityDriverProbe(void) AppArmorSecurityDriverProbe(void)
{ {
char template[PATH_MAX]; char *template = NULL;
int rc = SECURITY_DRIVER_DISABLE;
if (use_apparmor() < 0) if (use_apparmor() < 0)
return SECURITY_DRIVER_DISABLE; return rc;
/* see if template file exists */ /* see if template file exists */
if (snprintf(template, PATH_MAX, "%s/TEMPLATE", if (virAsprintf(&template, "%s/TEMPLATE",
APPARMOR_DIR "/libvirt") > PATH_MAX - 1) { APPARMOR_DIR "/libvirt") == -1) {
virSecurityReportError(NULL, VIR_ERR_INTERNAL_ERROR, virReportOOMError(NULL);
"%s", _("template too large")); return rc;
return SECURITY_DRIVER_DISABLE;
} }
if (!virFileExists(template)) { if (!virFileExists(template)) {
virSecurityReportError(NULL, VIR_ERR_INTERNAL_ERROR, virSecurityReportError(NULL, VIR_ERR_INTERNAL_ERROR,
_("template \'%s\' does not exist"), template); _("template \'%s\' does not exist"), template);
return SECURITY_DRIVER_DISABLE; goto clean;
} }
rc = SECURITY_DRIVER_ENABLE;
return SECURITY_DRIVER_ENABLE; clean:
VIR_FREE(template);
return rc;
} }
/* Security driver initialization. DOI is for 'Domain of Interpretation' and is /* Security driver initialization. DOI is for 'Domain of Interpretation' and is