diff options
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/audit.c | 57 | ||||
| -rw-r--r-- | src/shared/util.c | 13 |
2 files changed, 23 insertions, 47 deletions
diff --git a/src/shared/audit.c b/src/shared/audit.c index 97560cc9a3..9ab46408da 100644 --- a/src/shared/audit.c +++ b/src/shared/audit.c @@ -26,8 +26,6 @@ #include <stdlib.h> #include <stdio.h> #include <ctype.h> -#include <sys/prctl.h> -#include <sys/capability.h> #include "macro.h" #include "audit.h" @@ -37,91 +35,64 @@ #include "virt.h" int audit_session_from_pid(pid_t pid, uint32_t *id) { - char *s; + _cleanup_free_ char *s = NULL; + const char *p; uint32_t u; int r; assert(id); - if (have_effective_cap(CAP_AUDIT_CONTROL) <= 0) - return -ENOENT; - /* Audit doesn't support containers right now */ if (detect_container(NULL) > 0) return -ENOTSUP; if (pid == 0) - r = read_one_line_file("/proc/self/sessionid", &s); - else { - char *p; - - if (asprintf(&p, "/proc/%lu/sessionid", (unsigned long) pid) < 0) - return -ENOMEM; - - r = read_one_line_file(p, &s); - free(p); - } + p = "/proc/self/sessionid"; + else + p = procfs_file_alloca(pid, "sessionid"); + r = read_one_line_file(p, &s); if (r < 0) return r; r = safe_atou32(s, &u); - free(s); - if (r < 0) return r; if (u == (uint32_t) -1 || u <= 0) - return -ENOENT; + return -ENXIO; *id = u; return 0; } int audit_loginuid_from_pid(pid_t pid, uid_t *uid) { - char *s; + _cleanup_free_ char *s = NULL; + const char *p; uid_t u; int r; assert(uid); - /* Only use audit login uid if we are executed with sufficient - * capabilities so that pam_loginuid could do its job. If we - * are lacking the CAP_AUDIT_CONTROL capabality we most likely - * are being run in a container and /proc/self/loginuid is - * useless since it probably contains a uid of the host - * system. */ - - if (have_effective_cap(CAP_AUDIT_CONTROL) <= 0) - return -ENOENT; - /* Audit doesn't support containers right now */ if (detect_container(NULL) > 0) return -ENOTSUP; if (pid == 0) - r = read_one_line_file("/proc/self/loginuid", &s); - else { - char *p; - - if (asprintf(&p, "/proc/%lu/loginuid", (unsigned long) pid) < 0) - return -ENOMEM; - - r = read_one_line_file(p, &s); - free(p); - } + p = "/proc/self/loginuid"; + else + p = procfs_file_alloca(pid, "loginuid"); + r = read_one_line_file(p, &s); if (r < 0) return r; r = parse_uid(s, &u); - free(s); - if (r < 0) return r; if (u == (uid_t) -1) - return -ENOENT; + return -ENXIO; *uid = (uid_t) u; return 0; diff --git a/src/shared/util.c b/src/shared/util.c index 0fce2537da..38134ae521 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -430,7 +430,7 @@ char *split_quoted(const char *c, size_t *l, char **state) { *state = (char*) e; } - return current; + return (char*) current; } int get_parent_of_pid(pid_t pid, pid_t *_ppid) { @@ -497,7 +497,7 @@ int get_starttime_of_pid(pid_t pid, unsigned long long *st) { f = fopen(p, "re"); if (!f) - return -errno; + return errno == ENOENT ? -ESRCH : -errno; if (!fgets(line, sizeof(line), f)) { if (ferror(f)) @@ -563,6 +563,7 @@ char *truncate_nl(char *s) { int get_process_comm(pid_t pid, char **name) { const char *p; + int r; assert(name); assert(pid >= 0); @@ -572,7 +573,11 @@ int get_process_comm(pid_t pid, char **name) { else p = procfs_file_alloca(pid, "comm"); - return read_one_line_file(p, name); + r = read_one_line_file(p, name); + if (r == -ENOENT) + return -ESRCH; + + return r; } int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char **line) { @@ -729,7 +734,7 @@ int get_process_exe(pid_t pid, char **name) { r = readlink_malloc(p, name); if (r < 0) - return r; + return r == -ENOENT ? -ESRCH : r; d = endswith(*name, " (deleted)"); if (d) |