summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-10-23 19:07:02 +0200
committerAnthony G. Basile <blueness@gentoo.org>2014-10-25 18:38:11 -0400
commit9efbf32a55d250eb414289f40ea471e1473ddb16 (patch)
treed5f7247a80c5a15d939fcd9dedd32f10c2e0d7ee
parent328f4fa3118e2a6c7376599cc69969e38bcdf8b0 (diff)
selinux: simplify and unify logging
Normally we shouldn#t log from "library" functions, but SELinux is weird, hence upgrade security messages uniformly to LOG_ERR when in enforcing mode. Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
-rw-r--r--src/shared/selinux-util.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/shared/selinux-util.c b/src/shared/selinux-util.c
index 7887482bd3..b4ac441c21 100644
--- a/src/shared/selinux-util.c
+++ b/src/shared/selinux-util.c
@@ -40,6 +40,8 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(context_t, context_free);
static int cached_use = -1;
static struct selabel_handle *label_hnd = NULL;
+
+#define log_enforcing(...) log_full(security_getenforce() == 1 ? LOG_ERR : LOG_DEBUG, __VA_ARGS__)
#endif
bool mac_selinux_use(void) {
@@ -85,8 +87,7 @@ int mac_selinux_init(const char *prefix) {
label_hnd = selabel_open(SELABEL_CTX_FILE, NULL, 0);
if (!label_hnd) {
- log_full(security_getenforce() == 1 ? LOG_ERR : LOG_DEBUG,
- "Failed to initialize SELinux context: %m");
+ log_enforcing("Failed to initialize SELinux context: %m");
r = security_getenforce() == 1 ? -errno : 0;
} else {
char timespan[FORMAT_TIMESPAN_MAX];
@@ -145,7 +146,7 @@ int mac_selinux_fix(const char *path, bool ignore_enoent, bool ignore_erofs) {
if (ignore_erofs && errno == EROFS)
return 0;
- log_full(security_getenforce() == 1 ? LOG_ERR : LOG_DEBUG, "Unable to fix SELinux label of %s: %m", path);
+ log_enforcing("Unable to fix SELinux label of %s: %m", path);
r = security_getenforce() == 1 ? -errno : 0;
}
#endif
@@ -282,7 +283,7 @@ int mac_selinux_context_set(const char *path, mode_t mode) {
#ifdef HAVE_SELINUX
_cleanup_security_context_free_ security_context_t filecon = NULL;
- if (!mac_selinux_use() || !label_hnd)
+ if (!label_hnd)
return 0;
r = selabel_lookup_raw(label_hnd, &filecon, path, mode);
@@ -291,7 +292,7 @@ int mac_selinux_context_set(const char *path, mode_t mode) {
else if (r == 0) {
r = setfscreatecon(filecon);
if (r < 0) {
- log_error("Failed to set SELinux file context on %s: %m", path);
+ log_enforcing("Failed to set SELinux file context on %s: %m", path);
r = -errno;
}
}
@@ -310,8 +311,7 @@ int mac_selinux_socket_set(const char *label) {
return 0;
if (setsockcreatecon((security_context_t) label) < 0) {
- log_full(security_getenforce() == 1 ? LOG_ERR : LOG_DEBUG,
- "Failed to set SELinux context (%s) on socket: %m", label);
+ log_enforcing("Failed to set SELinux context (%s) on socket: %m", label);
if (security_getenforce() == 1)
return -errno;
@@ -381,7 +381,7 @@ int mac_selinux_mkdir(const char *path, mode_t mode) {
r = setfscreatecon(fcon);
if (r < 0 && errno != ENOENT) {
- log_error("Failed to set security context %s for %s: %m", fcon, path);
+ log_enforcing("Failed to set security context %s for %s: %m", fcon, path);
if (security_getenforce() == 1) {
r = -errno;
@@ -448,7 +448,7 @@ int mac_selinux_bind(int fd, const struct sockaddr *addr, socklen_t addrlen) {
r = setfscreatecon(fcon);
if (r < 0 && errno != ENOENT) {
- log_error("Failed to set security context %s for %s: %m", fcon, path);
+ log_enforcing("Failed to set security context %s for %s: %m", fcon, path);
if (security_getenforce() == 1) {
r = -errno;