diff options
| author | Luca Boccassi <bluca@debian.org> | 2024-12-02 23:03:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-02 23:03:52 +0100 |
| commit | 80ea2271913fdbe48b413759a46b4479b07579e1 (patch) | |
| tree | 1e29c98920aa70f4907f468601ea66e60cd7575c | |
| parent | Bash completion: no more ANSI colorcode in pathnames (diff) | |
| parent | basic/namespace-util: fix double logging after fork failure (diff) | |
| download | systemd-80ea2271913fdbe48b413759a46b4479b07579e1.tar.xz systemd-80ea2271913fdbe48b413759a46b4479b07579e1.zip | |
pid1: assume user namespaces are unavailable if we get -EINVAL from clone (#35440)
| -rw-r--r-- | src/basic/namespace-util.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/basic/namespace-util.c b/src/basic/namespace-util.c index 5d02ac6025..332e8cdfd5 100644 --- a/src/basic/namespace-util.c +++ b/src/basic/namespace-util.c @@ -348,7 +348,7 @@ int userns_acquire(const char *uid_map, const char *gid_map) { r = safe_fork("(sd-mkuserns)", FORK_CLOSE_ALL_FDS|FORK_DEATHSIG_SIGKILL|FORK_NEW_USERNS, &pid); if (r < 0) - return log_debug_errno(r, "Failed to fork process (sd-mkuserns): %m"); + return r; if (r == 0) /* Child. We do nothing here, just freeze until somebody kills us. */ freeze(); @@ -551,27 +551,27 @@ int is_idmapping_supported(const char *path) { if (r < 0) return r; - userns_fd = userns_acquire(uid_map, gid_map); - if (ERRNO_IS_NEG_NOT_SUPPORTED(userns_fd) || ERRNO_IS_NEG_PRIVILEGE(userns_fd)) + userns_fd = r = userns_acquire(uid_map, gid_map); + if (ERRNO_IS_NEG_NOT_SUPPORTED(r) || ERRNO_IS_NEG_PRIVILEGE(r) || r == -EINVAL) return false; - if (userns_fd == -ENOSPC) { - log_debug_errno(userns_fd, "Failed to acquire new user namespace, user.max_user_namespaces seems to be exhausted or maybe even zero, assuming ID-mapping is not supported: %m"); + if (r == -ENOSPC) { + log_debug_errno(r, "Failed to acquire new user namespace, user.max_user_namespaces seems to be exhausted or maybe even zero, assuming ID-mapping is not supported: %m"); return false; } - if (userns_fd < 0) - return log_debug_errno(userns_fd, "Failed to acquire new user namespace for checking if '%s' supports ID-mapping: %m", path); + if (r < 0) + return log_debug_errno(r, "Failed to acquire new user namespace for checking if '%s' supports ID-mapping: %m", path); - dir_fd = RET_NERRNO(open(path, O_RDONLY | O_CLOEXEC | O_NOFOLLOW)); - if (ERRNO_IS_NEG_NOT_SUPPORTED(dir_fd)) + dir_fd = r = RET_NERRNO(open(path, O_RDONLY | O_CLOEXEC | O_NOFOLLOW)); + if (ERRNO_IS_NEG_NOT_SUPPORTED(r)) return false; - if (dir_fd < 0) - return log_debug_errno(dir_fd, "Failed to open '%s', cannot determine if ID-mapping is supported: %m", path); + if (r < 0) + return log_debug_errno(r, "Failed to open '%s', cannot determine if ID-mapping is supported: %m", path); - mount_fd = RET_NERRNO(open_tree(dir_fd, "", AT_EMPTY_PATH | OPEN_TREE_CLONE | OPEN_TREE_CLOEXEC)); - if (ERRNO_IS_NEG_NOT_SUPPORTED(mount_fd) || ERRNO_IS_NEG_PRIVILEGE(mount_fd) || mount_fd == -EINVAL) + mount_fd = r = RET_NERRNO(open_tree(dir_fd, "", AT_EMPTY_PATH | OPEN_TREE_CLONE | OPEN_TREE_CLOEXEC)); + if (ERRNO_IS_NEG_NOT_SUPPORTED(r) || ERRNO_IS_NEG_PRIVILEGE(r) || r == -EINVAL) return false; - if (mount_fd < 0) - return log_debug_errno(mount_fd, "Failed to open mount tree '%s', cannot determine if ID-mapping is supported: %m", path); + if (r < 0) + return log_debug_errno(r, "Failed to open mount tree '%s', cannot determine if ID-mapping is supported: %m", path); r = RET_NERRNO(mount_setattr(mount_fd, "", AT_EMPTY_PATH, &(struct mount_attr) { |