pam: use /proc/self/loginuid only if we have CAP_AUDIT_CONTROL
This commit is contained in:
+17
-7
@@ -24,6 +24,7 @@
|
||||
#include <sys/file.h>
|
||||
#include <pwd.h>
|
||||
#include <endian.h>
|
||||
#include <sys/capability.h>
|
||||
|
||||
#include <security/pam_modules.h>
|
||||
#include <security/_pam_macros.h>
|
||||
@@ -288,15 +289,24 @@ static int get_user_data(
|
||||
assert(ret_username);
|
||||
assert(ret_pw);
|
||||
|
||||
if (read_one_line_file("/proc/self/loginuid", &s) >= 0) {
|
||||
uint32_t u;
|
||||
if (have_effective_cap(CAP_AUDIT_CONTROL)) {
|
||||
/* 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. */
|
||||
|
||||
r = safe_atou32(s, &u);
|
||||
free(s);
|
||||
if (read_one_line_file("/proc/self/loginuid", &s) >= 0) {
|
||||
uint32_t u;
|
||||
|
||||
if (r >= 0 && u != (uint32_t) -1 && u > 0) {
|
||||
have_loginuid = true;
|
||||
pw = pam_modutil_getpwuid(handle, u);
|
||||
r = safe_atou32(s, &u);
|
||||
free(s);
|
||||
|
||||
if (r >= 0 && u != (uint32_t) -1 && u > 0) {
|
||||
have_loginuid = true;
|
||||
pw = pam_modutil_getpwuid(handle, u);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+18
@@ -50,6 +50,7 @@
|
||||
#include <linux/kd.h>
|
||||
#include <dlfcn.h>
|
||||
#include <sys/wait.h>
|
||||
#include <sys/capability.h>
|
||||
|
||||
#include "macro.h"
|
||||
#include "util.h"
|
||||
@@ -4236,6 +4237,23 @@ void parse_syslog_priority(char **p, int *priority) {
|
||||
*p += k;
|
||||
}
|
||||
|
||||
int have_effective_cap(int value) {
|
||||
cap_t cap;
|
||||
cap_flag_value_t fv;
|
||||
int r;
|
||||
|
||||
if (!(cap = cap_get_proc()))
|
||||
return -errno;
|
||||
|
||||
if (cap_get_flag(cap, value, CAP_EFFECTIVE, &fv) < 0)
|
||||
r = -errno;
|
||||
else
|
||||
r = fv == CAP_SET;
|
||||
|
||||
cap_free(cap);
|
||||
return r;
|
||||
}
|
||||
|
||||
static const char *const ioprio_class_table[] = {
|
||||
[IOPRIO_CLASS_NONE] = "none",
|
||||
[IOPRIO_CLASS_RT] = "realtime",
|
||||
|
||||
@@ -396,6 +396,8 @@ bool plymouth_running(void);
|
||||
|
||||
void parse_syslog_priority(char **p, int *priority);
|
||||
|
||||
int have_effective_cap(int value);
|
||||
|
||||
#define NULSTR_FOREACH(i, l) \
|
||||
for ((i) = (l); (i) && *(i); (i) = strchr((i), 0)+1)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user