Safer handling if we can't open /proc/self/uid_map
passt is allowed to run as "root" (UID 0) in a user namespace, but notas real root in the init namespace. We read /proc/self/uid_map to determine if we're in the init namespace or not. If we're unable to open /proc/self/uid_map we assume we're ok and continue running as UID 0. This seems unwise. The only instances I can think of where uid_map won't be available are if the host kernel doesn't support namespaces, or /proc is not mounted. In neither case is it safe to assume we're "not really" root and continue (although in practice we'd likely fail for other reasons pretty soon anyway). Therefore, fail with an error in this case, instead of carrying on. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
parent
80d7012b09
commit
5d3b50c100
1 changed files with 6 additions and 2 deletions
8
conf.c
8
conf.c
|
@ -1054,8 +1054,12 @@ static int conf_ugid(const char *runas, uid_t *uid, gid_t *gid)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
/* ...or at least not root in the init namespace... */
|
/* ...or at least not root in the init namespace... */
|
||||||
if ((fd = open("/proc/self/uid_map", O_RDONLY | O_CLOEXEC)) < 0)
|
if ((fd = open("/proc/self/uid_map", O_RDONLY | O_CLOEXEC)) < 0) {
|
||||||
return 0;
|
ret = -errno;
|
||||||
|
err("Can't determine if we're in init namespace: %s",
|
||||||
|
strerror(-ret));
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
if (read(fd, buf, BUFSIZ) != sizeof(root_uid_map) ||
|
if (read(fd, buf, BUFSIZ) != sizeof(root_uid_map) ||
|
||||||
strncmp(buf, root_uid_map, sizeof(root_uid_map) - 1)) {
|
strncmp(buf, root_uid_map, sizeof(root_uid_map) - 1)) {
|
||||||
|
|
Loading…
Reference in a new issue