shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-24 21:34:08 +03:00
Code

bus: when entering an existing namespace to connect to a container's system bus also switch over PID namespace

Browse Source 
This is necessary to ensure that kdbus can collect creds of the
destination namespace when connecting.
This commit is contained in:
Lennart Poettering 2013-12-17 01:03:09 +01:00
parent d003f514da
commit a4475f577b
5 changed files with 38 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libsystemd-bus/bus-container.c
View File

@ -29,7 +29,7 @@
#include "bus-container.h"
int bus_container_connect_socket(sd_bus *b) {
_cleanup_close_ int nsfd = -1, rootfd = -1;
_cleanup_close_ int pidnsfd = -1, mntnsfd = -1, rootfd = -1;
pid_t leader, child;
siginfo_t si;
int r;
@ -42,7 +42,7 @@ int bus_container_connect_socket(sd_bus *b) {
if (r < 0)
return r;
r = namespace_open(leader, &nsfd, &rootfd);
r = namespace_open(leader, &pidnsfd, &mntnsfd, &rootfd);
if (r < 0)
return r;
@ -62,7 +62,7 @@ int bus_container_connect_socket(sd_bus *b) {
if (child == 0) {
r = namespace_enter(nsfd, rootfd);
r = namespace_enter(pidnsfd, mntnsfd, rootfd);
if (r < 0)
_exit(255);
@ -95,7 +95,7 @@ int bus_container_connect_socket(sd_bus *b) {
int bus_container_connect_kernel(sd_bus *b) {
_cleanup_close_pipe_ int pair[2] = { -1, -1 };
_cleanup_close_ int nsfd = -1, rootfd = -1;
_cleanup_close_ int pidnsfd = -1, mntnsfd = -1, rootfd = -1;
union {
struct cmsghdr cmsghdr;
uint8_t buf[CMSG_SPACE(sizeof(int))];
@ -118,7 +118,7 @@ int bus_container_connect_kernel(sd_bus *b) {
if (r < 0)
return r;
r = namespace_open(leader, &nsfd, &rootfd);
r = namespace_open(leader, &pidnsfd, &mntnsfd, &rootfd);
if (r < 0)
return r;
@ -133,7 +133,7 @@ int bus_container_connect_kernel(sd_bus *b) {
close_nointr_nofail(pair[0]);
pair[0] = -1;
r = namespace_enter(nsfd, rootfd);
r = namespace_enter(pidnsfd, mntnsfd, rootfd);
if (r < 0)
_exit(EXIT_FAILURE);

6
src/machine/machinectl.c
View File

@ -399,7 +399,7 @@ static int terminate_machine(sd_bus *bus, char **args, unsigned n) {
static int openpt_in_namespace(pid_t pid, int flags) {
_cleanup_close_pipe_ int pair[2] = { -1, -1 };
_cleanup_close_ int nsfd = -1, rootfd = -1;
_cleanup_close_ int pidnsfd = -1, mntnsfd = -1, rootfd = -1;
union {
struct cmsghdr cmsghdr;
uint8_t buf[CMSG_SPACE(sizeof(int))];
@ -413,7 +413,7 @@ static int openpt_in_namespace(pid_t pid, int flags) {
pid_t child;
siginfo_t si;
r = namespace_open(pid, &nsfd, &rootfd);
r = namespace_open(pid, &pidnsfd, &mntnsfd, &rootfd);
if (r < 0)
return r;
@ -428,7 +428,7 @@ static int openpt_in_namespace(pid_t pid, int flags) {
close_nointr_nofail(pair[0]);
pair[0] = -1;
r = namespace_enter(nsfd, rootfd);
r = namespace_enter(pidnsfd, mntnsfd, rootfd);
if (r < 0)
_exit(EXIT_FAILURE);

6
src/shared/logs-show.c
View File

@ -1117,7 +1117,7 @@ int add_matches_for_user_unit(sd_journal *j, const char *unit, uid_t uid) {
static int get_boot_id_for_machine(const char *machine, sd_id128_t *boot_id) {
_cleanup_close_pipe_ int pair[2] = { -1, -1 };
_cleanup_close_ int nsfd = -1, rootfd = -1;
_cleanup_close_ int pidnsfd = -1, mntnsfd = -1, rootfd = -1;
pid_t pid, child;
siginfo_t si;
char buf[37];
@ -1134,7 +1134,7 @@ static int get_boot_id_for_machine(const char *machine, sd_id128_t *boot_id) {
if (r < 0)
return r;
r = namespace_open(pid, &nsfd, &rootfd);
r = namespace_open(pid, &pidnsfd, &mntnsfd, &rootfd);
if (r < 0)
return r;
@ -1151,7 +1151,7 @@ static int get_boot_id_for_machine(const char *machine, sd_id128_t *boot_id) {
close_nointr_nofail(pair[0]);
pair[0] = -1;
r = namespace_enter(nsfd, rootfd);
r = namespace_enter(pidnsfd, mntnsfd, rootfd);
if (r < 0)
_exit(EXIT_FAILURE);

36
src/shared/util.c
View File

@ -6029,18 +6029,24 @@ int container_get_leader(const char *machine, pid_t *pid) {
return 0;
}
int namespace_open(pid_t pid, int *namespace_fd, int *root_fd) {
_cleanup_close_ int nsfd = -1;
const char *ns, *root;
int namespace_open(pid_t pid, int *pidns_fd, int *mntns_fd, int *root_fd) {
_cleanup_close_ int pidnsfd = -1, mntnsfd = -1;
const char *pidns, *mntns, *root;
int rfd;
assert(pid >= 0);
assert(namespace_fd);
assert(pidns_fd);
assert(mntns_fd);
assert(root_fd);
ns = procfs_file_alloca(pid, "ns/mnt");
nsfd = open(ns, O_RDONLY|O_NOCTTY|O_CLOEXEC);
if (nsfd < 0)
mntns = procfs_file_alloca(pid, "ns/mnt");
mntnsfd = open(mntns, O_RDONLY|O_NOCTTY|O_CLOEXEC);
if (mntnsfd < 0)
return -errno;
pidns = procfs_file_alloca(pid, "ns/pid");
pidnsfd = open(pidns, O_RDONLY|O_NOCTTY|O_CLOEXEC);
if (pidnsfd < 0)
return -errno;
root = procfs_file_alloca(pid, "root");
@ -6048,18 +6054,24 @@ int namespace_open(pid_t pid, int *namespace_fd, int *root_fd) {
if (rfd < 0)
return -errno;
*namespace_fd = nsfd;
*pidns_fd = pidnsfd;
*mntns_fd = mntnsfd;
*root_fd = rfd;
nsfd = -1;
pidnsfd = -1;
mntnsfd = -1;
return 0;
}
int namespace_enter(int namespace_fd, int root_fd) {
assert(namespace_fd >= 0);
int namespace_enter(int pidns_fd, int mntns_fd, int root_fd) {
assert(pidns_fd >= 0);
assert(mntns_fd >= 0);
assert(root_fd >= 0);
if (setns(namespace_fd, CLONE_NEWNS) < 0)
if (setns(pidns_fd, CLONE_NEWPID) < 0)
return -errno;
if (setns(mntns_fd, CLONE_NEWNS) < 0)
return -errno;
if (fchdir(root_fd) < 0)

4
src/shared/util.h
View File

@ -793,5 +793,5 @@ int proc_cmdline(char **ret);
int container_get_leader(const char *machine, pid_t *pid);
int namespace_open(pid_t pid, int *namespace_fd, int *root_fd);
int namespace_enter(int namespace_fd, int root_fd);
int namespace_open(pid_t pid, int *pidns_fd, int *mntns_fd, int *root_fd);
int namespace_enter(int pidns_fd, int mntns_fd, int root_fd);