Merge pull request #318 from walyong/smack_v02
SMACK v02: support modify rules and add default executed process label
This commit is contained in:
commit
f3941a6f33
10
configure.ac
10
configure.ac
|
@ -673,8 +673,14 @@ fi
|
||||||
|
|
||||||
AC_ARG_WITH(smack-run-label,
|
AC_ARG_WITH(smack-run-label,
|
||||||
AS_HELP_STRING([--with-smack-run-label=STRING],
|
AS_HELP_STRING([--with-smack-run-label=STRING],
|
||||||
[run systemd --system with a specific SMACK label]),
|
[run systemd --system itself with a specific SMACK label]),
|
||||||
[AC_DEFINE_UNQUOTED(SMACK_RUN_LABEL, ["$withval"], [Run with a smack label])],
|
[AC_DEFINE_UNQUOTED(SMACK_RUN_LABEL, ["$withval"], [Run systemd itself with SMACK label])],
|
||||||
|
[])
|
||||||
|
|
||||||
|
AC_ARG_WITH(smack-default-process-label,
|
||||||
|
AS_HELP_STRING([--with-smack-default-process-label=STRING],
|
||||||
|
[default SMACK label for executed processes]),
|
||||||
|
[AC_DEFINE_UNQUOTED(SMACK_DEFAULT_PROCESS_LABEL, ["$withval"], [Default SMACK label for executed processes])],
|
||||||
[])
|
[])
|
||||||
|
|
||||||
if test "x${have_smack}" = xyes ; then
|
if test "x${have_smack}" = xyes ; then
|
||||||
|
|
|
@ -1717,6 +1717,15 @@ static int exec_child(
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#ifdef SMACK_DEFAULT_PROCESS_LABEL
|
||||||
|
else {
|
||||||
|
r = mac_smack_apply_pid(0, SMACK_DEFAULT_PROCESS_LABEL);
|
||||||
|
if (r < 0) {
|
||||||
|
*exit_status = EXIT_SMACK_PROCESS_LABEL;
|
||||||
|
return r;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (context->user) {
|
if (context->user) {
|
||||||
|
|
|
@ -34,31 +34,35 @@
|
||||||
#include "fileio.h"
|
#include "fileio.h"
|
||||||
#include "log.h"
|
#include "log.h"
|
||||||
|
|
||||||
#define SMACK_CONFIG "/etc/smack/accesses.d/"
|
|
||||||
#define CIPSO_CONFIG "/etc/smack/cipso.d/"
|
|
||||||
|
|
||||||
#ifdef HAVE_SMACK
|
#ifdef HAVE_SMACK
|
||||||
|
|
||||||
static int write_rules(const char* dstpath, const char* srcdir) {
|
static int write_access2_rules(const char* srcdir) {
|
||||||
_cleanup_fclose_ FILE *dst = NULL;
|
_cleanup_close_ int load2_fd = -1, change_fd = -1;
|
||||||
_cleanup_closedir_ DIR *dir = NULL;
|
_cleanup_closedir_ DIR *dir = NULL;
|
||||||
struct dirent *entry;
|
struct dirent *entry;
|
||||||
char buf[NAME_MAX];
|
char buf[NAME_MAX];
|
||||||
int dfd = -1;
|
int dfd = -1;
|
||||||
int r = 0;
|
int r = 0;
|
||||||
|
|
||||||
dst = fopen(dstpath, "we");
|
load2_fd = open("/sys/fs/smackfs/load2", O_RDWR|O_CLOEXEC|O_NONBLOCK|O_NOCTTY);
|
||||||
if (!dst) {
|
if (load2_fd < 0) {
|
||||||
if (errno != ENOENT)
|
if (errno != ENOENT)
|
||||||
log_warning_errno(errno, "Failed to open %s: %m", dstpath);
|
log_warning_errno(errno, "Failed to open '/sys/fs/smackfs/load2': %m");
|
||||||
return -errno; /* negative error */
|
return -errno; /* negative error */
|
||||||
}
|
}
|
||||||
|
|
||||||
/* write rules to dst from every file in the directory */
|
change_fd = open("/sys/fs/smackfs/change-rule", O_RDWR|O_CLOEXEC|O_NONBLOCK|O_NOCTTY);
|
||||||
|
if (change_fd < 0) {
|
||||||
|
if (errno != ENOENT)
|
||||||
|
log_warning_errno(errno, "Failed to open '/sys/fs/smackfs/change-rule': %m");
|
||||||
|
return -errno; /* negative error */
|
||||||
|
}
|
||||||
|
|
||||||
|
/* write rules to load2 or change-rule from every file in the directory */
|
||||||
dir = opendir(srcdir);
|
dir = opendir(srcdir);
|
||||||
if (!dir) {
|
if (!dir) {
|
||||||
if (errno != ENOENT)
|
if (errno != ENOENT)
|
||||||
log_warning_errno(errno, "Failed to opendir %s: %m", srcdir);
|
log_warning_errno(errno, "Failed to opendir '%s': %m", srcdir);
|
||||||
return errno; /* positive on purpose */
|
return errno; /* positive on purpose */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -69,11 +73,14 @@ static int write_rules(const char* dstpath, const char* srcdir) {
|
||||||
int fd;
|
int fd;
|
||||||
_cleanup_fclose_ FILE *policy = NULL;
|
_cleanup_fclose_ FILE *policy = NULL;
|
||||||
|
|
||||||
|
if (!dirent_is_file(entry))
|
||||||
|
continue;
|
||||||
|
|
||||||
fd = openat(dfd, entry->d_name, O_RDONLY|O_CLOEXEC);
|
fd = openat(dfd, entry->d_name, O_RDONLY|O_CLOEXEC);
|
||||||
if (fd < 0) {
|
if (fd < 0) {
|
||||||
if (r == 0)
|
if (r == 0)
|
||||||
r = -errno;
|
r = -errno;
|
||||||
log_warning_errno(errno, "Failed to open %s: %m", entry->d_name);
|
log_warning_errno(errno, "Failed to open '%s': %m", entry->d_name);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -82,30 +89,108 @@ static int write_rules(const char* dstpath, const char* srcdir) {
|
||||||
if (r == 0)
|
if (r == 0)
|
||||||
r = -errno;
|
r = -errno;
|
||||||
safe_close(fd);
|
safe_close(fd);
|
||||||
log_error_errno(errno, "Failed to open %s: %m", entry->d_name);
|
log_error_errno(errno, "Failed to open '%s': %m", entry->d_name);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* load2 write rules in the kernel require a line buffered stream */
|
/* load2 write rules in the kernel require a line buffered stream */
|
||||||
FOREACH_LINE(buf, policy,
|
FOREACH_LINE(buf, policy,
|
||||||
log_error_errno(errno, "Failed to read line from %s: %m",
|
log_error_errno(errno, "Failed to read line from '%s': %m",
|
||||||
entry->d_name)) {
|
entry->d_name)) {
|
||||||
if (!fputs(buf, dst)) {
|
|
||||||
if (r == 0)
|
_cleanup_free_ char *sbj = NULL, *obj = NULL, *acc1 = NULL, *acc2 = NULL;
|
||||||
r = -EINVAL;
|
|
||||||
log_error("Failed to write line to %s", dstpath);
|
if (isempty(truncate_nl(buf)))
|
||||||
break;
|
continue;
|
||||||
|
|
||||||
|
/* if 3 args -> load rule : subject object access1 */
|
||||||
|
/* if 4 args -> change rule : subject object access1 access2 */
|
||||||
|
if (sscanf(buf, "%ms %ms %ms %ms", &sbj, &obj, &acc1, &acc2) < 3) {
|
||||||
|
log_error_errno(errno, "Failed to parse rule '%s' in '%s', ignoring.", buf, entry->d_name);
|
||||||
|
continue;
|
||||||
}
|
}
|
||||||
if (fflush(dst)) {
|
|
||||||
|
if (write(isempty(acc2) ? load2_fd : change_fd, buf, strlen(buf)) < 0) {
|
||||||
if (r == 0)
|
if (r == 0)
|
||||||
r = -errno;
|
r = -errno;
|
||||||
log_error_errno(errno, "Failed to flush writes to %s: %m", dstpath);
|
log_error_errno(errno, "Failed to write '%s' to '%s' in '%s'",
|
||||||
|
buf, isempty(acc2) ? "/sys/fs/smackfs/load2" : "/sys/fs/smackfs/change-rule", entry->d_name);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return r;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int write_cipso2_rules(const char* srcdir) {
|
||||||
|
_cleanup_close_ int cipso2_fd = -1;
|
||||||
|
_cleanup_closedir_ DIR *dir = NULL;
|
||||||
|
struct dirent *entry;
|
||||||
|
char buf[NAME_MAX];
|
||||||
|
int dfd = -1;
|
||||||
|
int r = 0;
|
||||||
|
|
||||||
|
cipso2_fd = open("/sys/fs/smackfs/cipso2", O_RDWR|O_CLOEXEC|O_NONBLOCK|O_NOCTTY);
|
||||||
|
if (cipso2_fd < 0) {
|
||||||
|
if (errno != ENOENT)
|
||||||
|
log_warning_errno(errno, "Failed to open '/sys/fs/smackfs/cipso2': %m");
|
||||||
|
return -errno; /* negative error */
|
||||||
|
}
|
||||||
|
|
||||||
|
/* write rules to cipso2 from every file in the directory */
|
||||||
|
dir = opendir(srcdir);
|
||||||
|
if (!dir) {
|
||||||
|
if (errno != ENOENT)
|
||||||
|
log_warning_errno(errno, "Failed to opendir '%s': %m", srcdir);
|
||||||
|
return errno; /* positive on purpose */
|
||||||
|
}
|
||||||
|
|
||||||
|
dfd = dirfd(dir);
|
||||||
|
assert(dfd >= 0);
|
||||||
|
|
||||||
|
FOREACH_DIRENT(entry, dir, return 0) {
|
||||||
|
int fd;
|
||||||
|
_cleanup_fclose_ FILE *policy = NULL;
|
||||||
|
|
||||||
|
if (!dirent_is_file(entry))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
fd = openat(dfd, entry->d_name, O_RDONLY|O_CLOEXEC);
|
||||||
|
if (fd < 0) {
|
||||||
|
if (r == 0)
|
||||||
|
r = -errno;
|
||||||
|
log_error_errno(errno, "Failed to open '%s': %m", entry->d_name);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
policy = fdopen(fd, "re");
|
||||||
|
if (!policy) {
|
||||||
|
if (r == 0)
|
||||||
|
r = -errno;
|
||||||
|
safe_close(fd);
|
||||||
|
log_error_errno(errno, "Failed to open '%s': %m", entry->d_name);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* cipso2 write rules in the kernel require a line buffered stream */
|
||||||
|
FOREACH_LINE(buf, policy,
|
||||||
|
log_error_errno(errno, "Failed to read line from '%s': %m",
|
||||||
|
entry->d_name)) {
|
||||||
|
|
||||||
|
if (isempty(truncate_nl(buf)))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (write(cipso2_fd, buf, strlen(buf)) < 0) {
|
||||||
|
if (r == 0)
|
||||||
|
r = -errno;
|
||||||
|
log_error_errno(errno, "Failed to write '%s' to '/sys/fs/smackfs/cipso2' in '%s'",
|
||||||
|
buf, entry->d_name);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -118,13 +203,13 @@ int mac_smack_setup(bool *loaded_policy) {
|
||||||
|
|
||||||
assert(loaded_policy);
|
assert(loaded_policy);
|
||||||
|
|
||||||
r = write_rules("/sys/fs/smackfs/load2", SMACK_CONFIG);
|
r = write_access2_rules("/etc/smack/accesses.d/");
|
||||||
switch(r) {
|
switch(r) {
|
||||||
case -ENOENT:
|
case -ENOENT:
|
||||||
log_debug("Smack is not enabled in the kernel.");
|
log_debug("Smack is not enabled in the kernel.");
|
||||||
return 0;
|
return 0;
|
||||||
case ENOENT:
|
case ENOENT:
|
||||||
log_debug("Smack access rules directory " SMACK_CONFIG " not found");
|
log_debug("Smack access rules directory '/etc/smack/accesses.d/' not found");
|
||||||
return 0;
|
return 0;
|
||||||
case 0:
|
case 0:
|
||||||
log_info("Successfully loaded Smack policies.");
|
log_info("Successfully loaded Smack policies.");
|
||||||
|
@ -142,13 +227,13 @@ int mac_smack_setup(bool *loaded_policy) {
|
||||||
SMACK_RUN_LABEL, strerror(-r));
|
SMACK_RUN_LABEL, strerror(-r));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
r = write_rules("/sys/fs/smackfs/cipso2", CIPSO_CONFIG);
|
r = write_cipso2_rules("/etc/smack/cipso.d/");
|
||||||
switch(r) {
|
switch(r) {
|
||||||
case -ENOENT:
|
case -ENOENT:
|
||||||
log_debug("Smack/CIPSO is not enabled in the kernel.");
|
log_debug("Smack/CIPSO is not enabled in the kernel.");
|
||||||
return 0;
|
return 0;
|
||||||
case ENOENT:
|
case ENOENT:
|
||||||
log_debug("Smack/CIPSO access rules directory " CIPSO_CONFIG " not found");
|
log_debug("Smack/CIPSO access rules directory '/etc/smack/cipso.d/' not found");
|
||||||
return 0;
|
return 0;
|
||||||
case 0:
|
case 0:
|
||||||
log_info("Successfully loaded Smack/CIPSO policies.");
|
log_info("Successfully loaded Smack/CIPSO policies.");
|
||||||
|
|
Loading…
Reference in a new issue