namespace helpers: Allow entering a UID namespace

To be able to use `systemd-run` or `machinectl login` on a container
that is in a private user namespace, the sub-process must have entered
the user namespace before connecting to the container's D-Bus, otherwise
the UID and GID in the peer credentials are garbage.

So we extend namespace_open and namespace_enter to support UID namespaces,
and we enter the UID namespace in bus_container_connect_{socket,kernel}.

namespace_open will degrade to a no-op if user namespaces are not enabled
in the kernel.

Special handling is required for the setns call in namespace_enter with
a user namespace, since transitioning to your own namespace is forbidden,
as it would result in re-entering your user namespace as root.

Arguably it may be valid to check this at the call site, rather than
inside namespace_enter, but it is less code to do it inside, and if the
intention of calling namespace_enter is to *be* in the target namespace,
rather than to transition to the target namespace, it is a reasonable
approach.

The check for whether the user namespace is the same must happen before
entering namespaces, as we may not be able to access /proc during the
intermediate transition stage.

We can't instead attempt to enter the user namespace and then ignore
the failure from it being the same namespace, since the error code is
not distinct, and we can't compare namespaces while mid-transition.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
index 7658d7146d..b62a9bd813 100644
--- a/src/machine/machine-dbus.c
+++ b/src/machine/machine-dbus.c
@@ -212,7 +212,7 @@ int bus_machine_method_get_addresses(sd_bus_message *message, void *userdata, sd
         if (streq(us, them))
                 return sd_bus_error_setf(error, BUS_ERROR_NO_PRIVATE_NETWORKING, "Machine %s does not use private networking", m->name);
 
-        r = namespace_open(m->leader, NULL, NULL, &netns_fd, NULL);
+        r = namespace_open(m->leader, NULL, NULL, &netns_fd, NULL, NULL);
         if (r < 0)
                 return r;
 
@@ -230,7 +230,7 @@ int bus_machine_method_get_addresses(sd_bus_message *message, void *userdata, sd
 
                 pair[0] = safe_close(pair[0]);
 
-                r = namespace_enter(-1, -1, netns_fd, -1);
+                r = namespace_enter(-1, -1, netns_fd, -1, -1);
                 if (r < 0)
                         _exit(EXIT_FAILURE);
 
@@ -346,7 +346,7 @@ int bus_machine_method_get_os_release(sd_bus_message *message, void *userdata, s
         if (m->class != MACHINE_CONTAINER)
                 return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, "Requesting OS release data is only supported on container machines.");
 
-        r = namespace_open(m->leader, NULL, &mntns_fd, NULL, &root_fd);
+        r = namespace_open(m->leader, NULL, &mntns_fd, NULL, NULL, &root_fd);
         if (r < 0)
                 return r;
 
@@ -362,7 +362,7 @@ int bus_machine_method_get_os_release(sd_bus_message *message, void *userdata, s
 
                 pair[0] = safe_close(pair[0]);
 
-                r = namespace_enter(-1, mntns_fd, -1, root_fd);
+                r = namespace_enter(-1, mntns_fd, -1, -1, root_fd);
                 if (r < 0)
                         _exit(EXIT_FAILURE);