X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogin%2Flogind-user.c;h=987244e27ec1f2cfd5e55e699ca0376dce8ae0a9;hp=d2a4f7e9cbf9095d26d5ee12a5a96fe051b3caac;hb=1b99ea27bc3ffa1fc6f7cfe89563d891a9aed4c5;hpb=da927ba997d68401563b927f92e6e40e021a8e5c diff --git a/src/login/logind-user.c b/src/login/logind-user.c index d2a4f7e9c..987244e27 100644 --- a/src/login/logind-user.c +++ b/src/login/logind-user.c @@ -26,8 +26,8 @@ #include "util.h" #include "mkdir.h" +#include "rm-rf.h" #include "hashmap.h" -#include "strv.h" #include "fileio.h" #include "path-util.h" #include "special.h" @@ -38,6 +38,7 @@ #include "clean-ipc.h" #include "logind-user.h" #include "smack-util.h" +#include "formats-util.h" User* user_new(Manager *m, uid_t uid, gid_t gid, const char *name) { User *u; @@ -56,7 +57,7 @@ User* user_new(Manager *m, uid_t uid, gid_t gid, const char *name) { if (asprintf(&u->state_file, "/run/systemd/users/"UID_FMT, uid) < 0) goto fail; - if (hashmap_put(m->users, ULONG_TO_PTR((unsigned long) uid), u) < 0) + if (hashmap_put(m->users, UID_TO_PTR(uid), u) < 0) goto fail; u->manager = m; @@ -97,7 +98,7 @@ void user_free(User *u) { free(u->runtime_path); - hashmap_remove(u->manager->users, ULONG_TO_PTR((unsigned long) u->uid)); + hashmap_remove(u->manager->users, UID_TO_PTR(u->uid)); free(u->name); free(u->state_file); @@ -117,11 +118,11 @@ int user_save(User *u) { r = mkdir_safe_label("/run/systemd/users", 0755, 0, 0); if (r < 0) - goto finish; + goto fail; r = fopen_temporary(u->state_file, &f, &temp_path); if (r < 0) - goto finish; + goto fail; fchmod(fileno(f), 0644); @@ -242,19 +243,24 @@ int user_save(User *u) { fputc('\n', f); } - fflush(f); + r = fflush_and_check(f); + if (r < 0) + goto fail; - if (ferror(f) || rename(temp_path, u->state_file) < 0) { + if (rename(temp_path, u->state_file) < 0) { r = -errno; - unlink(u->state_file); - unlink(temp_path); + goto fail; } -finish: - if (r < 0) - log_error_errno(r, "Failed to save user data %s: %m", u->state_file); + return 0; - return r; +fail: + (void) unlink(u->state_file); + + if (temp_path) + (void) unlink(temp_path); + + return log_error_errno(r, "Failed to save user data %s: %m", u->state_file); } int user_load(User *u) { @@ -310,10 +316,8 @@ static int user_mkdir_runtime_path(User *u) { assert(u); r = mkdir_safe_label("/run/user", 0755, 0, 0); - if (r < 0) { - log_error_errno(r, "Failed to create /run/user: %m"); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to create /run/user: %m"); if (!u->runtime_path) { if (asprintf(&p, "/run/user/" UID_FMT, u->uid) < 0) @@ -324,13 +328,12 @@ static int user_mkdir_runtime_path(User *u) { if (path_is_mount_point(p, false) <= 0) { _cleanup_free_ char *t = NULL; - mkdir(p, 0700); + (void) mkdir(p, 0700); if (mac_smack_use()) r = asprintf(&t, "mode=0700,smackfsroot=*,uid=" UID_FMT ",gid=" GID_FMT ",size=%zu", u->uid, u->gid, u->manager->runtime_dir_size); else r = asprintf(&t, "mode=0700,uid=" UID_FMT ",gid=" GID_FMT ",size=%zu", u->uid, u->gid, u->manager->runtime_dir_size); - if (r < 0) { r = log_oom(); goto fail; @@ -338,8 +341,20 @@ static int user_mkdir_runtime_path(User *u) { r = mount("tmpfs", p, "tmpfs", MS_NODEV|MS_NOSUID, t); if (r < 0) { - log_error_errno(r, "Failed to mount per-user tmpfs directory %s: %m", p); - goto fail; + if (errno != EPERM) { + r = log_error_errno(errno, "Failed to mount per-user tmpfs directory %s: %m", p); + goto fail; + } + + /* Lacking permissions, maybe + * CAP_SYS_ADMIN-less container? In this case, + * just use a normal directory. */ + + r = chmod_and_chown(p, 0700, u->uid, u->gid); + if (r < 0) { + log_error_errno(r, "Failed to change runtime directory ownership and mode: %m"); + goto fail; + } } } @@ -347,7 +362,12 @@ static int user_mkdir_runtime_path(User *u) { return 0; fail: - free(p); + if (p) { + /* Try to clean up, but ignore errors */ + (void) rmdir(p); + free(p); + } + u->runtime_path = NULL; return r; } @@ -363,7 +383,7 @@ static int user_start_slice(User *u) { char lu[DECIMAL_STR_MAX(uid_t) + 1], *slice; sprintf(lu, UID_FMT, u->uid); - r = build_subslice(SPECIAL_USER_SLICE, lu, &slice); + r = slice_build_subslice(SPECIAL_USER_SLICE, lu, &slice); if (r < 0) return r; @@ -396,9 +416,9 @@ static int user_start_service(User *u) { char lu[DECIMAL_STR_MAX(uid_t) + 1], *service; sprintf(lu, UID_FMT, u->uid); - service = unit_name_build("user", lu, ".service"); - if (!service) - return log_oom(); + r = unit_name_build("user", lu, ".service", &service); + if (r < 0) + return log_error_errno(r, "Failed to build service name: %m"); r = manager_start_unit(u->manager, service, &error, &job); if (r < 0) { @@ -508,14 +528,18 @@ static int user_remove_runtime_path(User *u) { if (!u->runtime_path) return 0; - r = rm_rf(u->runtime_path, false, false, false); + r = rm_rf(u->runtime_path, 0); if (r < 0) log_error_errno(r, "Failed to remove runtime directory %s: %m", u->runtime_path); - if (umount2(u->runtime_path, MNT_DETACH) < 0) - log_error("Failed to unmount user runtime directory %s: %m", u->runtime_path); + /* Ignore cases where the directory isn't mounted, as that's + * quite possible, if we lacked the permissions to mount + * something */ + r = umount2(u->runtime_path, MNT_DETACH); + if (r < 0 && errno != EINVAL && errno != ENOENT) + log_error_errno(errno, "Failed to unmount user runtime directory %s: %m", u->runtime_path); - r = rm_rf(u->runtime_path, false, true, false); + r = rm_rf(u->runtime_path, REMOVE_ROOT); if (r < 0) log_error_errno(r, "Failed to remove runtime directory %s: %m", u->runtime_path); @@ -641,7 +665,7 @@ int user_check_linger_file(User *u) { if (!cc) return -ENOMEM; - p = strappenda("/var/lib/systemd/linger/", cc); + p = strjoina("/var/lib/systemd/linger/", cc); return access(p, F_OK) >= 0; }