summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-04-12 21:08:44 +0200
committerLennart Poettering <lennart@poettering.net>2011-04-12 21:08:44 +0200
commitac1234459056864aeb04053fdfe9b0001fc32590 (patch)
tree795ad03a0a809e6454a98a59bfed7a6cf7c3f968
parenta7444edaf768ae3dda13c42d8fe26f78b4e63e38 (diff)
pam: use /proc/self/loginuid only if we have CAP_AUDIT_CONTROL
-rw-r--r--src/pam-module.c24
-rw-r--r--src/util.c18
-rw-r--r--src/util.h2
3 files changed, 37 insertions, 7 deletions
diff --git a/src/pam-module.c b/src/pam-module.c
index 6486546e6d..b4130bbdd6 100644
--- a/src/pam-module.c
+++ b/src/pam-module.c
@@ -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);
+ }
}
}
diff --git a/src/util.c b/src/util.c
index d39cb48385..75ad56fecf 100644
--- a/src/util.c
+++ b/src/util.c
@@ -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",
diff --git a/src/util.h b/src/util.h
index ff38b35804..72ddd36e55 100644
--- a/src/util.h
+++ b/src/util.h
@@ -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)