selinux: make sure we never use /dev/null for making unit selinux access decisions

This commit is contained in:
Lennart Poettering
2018-01-31 19:54:25 +01:00
parent 0d5456556f
commit 81e9871e87
3 changed files with 20 additions and 4 deletions
+1 -4
View File
@@ -33,10 +33,7 @@ int mac_selinux_generic_access_check(sd_bus_message *message, const char *path,
mac_selinux_generic_access_check((message), NULL, (permission), (error))
#define mac_selinux_unit_access_check(unit, message, permission, error) \
({ \
const Unit *_unit = (unit); \
mac_selinux_generic_access_check((message), _unit->source_path ?: _unit->fragment_path, (permission), (error)); \
})
mac_selinux_generic_access_check((message), unit_label_path(unit), (permission), (error))
#else
+17
View File
@@ -5375,6 +5375,23 @@ bool unit_needs_console(Unit *u) {
return exec_context_may_touch_console(ec);
}
const char *unit_label_path(Unit *u) {
const char *p;
/* Returns the file system path to use for MAC access decisions, i.e. the file to read the SELinux label off
* when validating access checks. */
p = u->source_path ?: u->fragment_path;
if (!p)
return NULL;
/* If a unit is masked, then don't read the SELinux label of /dev/null, as that really makes no sense */
if (path_equal(p, "/dev/null"))
return NULL;
return p;
}
static const char* const collect_mode_table[_COLLECT_MODE_MAX] = {
[COLLECT_INACTIVE] = "inactive",
[COLLECT_INACTIVE_OR_FAILED] = "inactive-or-failed",
+2
View File
@@ -801,6 +801,8 @@ void unit_warn_leftover_processes(Unit *u);
bool unit_needs_console(Unit *u);
const char *unit_label_path(Unit *u);
/* Macros which append UNIT= or USER_UNIT= to the message */
#define log_unit_full(unit, level, error, ...) \