Skip to content

logind: fix /run/user/$UID creation in apparmor-confined containers #4154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
evverx merged 2 commits into from
Sep 15, 2016
Merged

logind: fix /run/user/$UID creation in apparmor-confined containers #4154

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40cd066
logind: fix /run/user/$UID creation in apparmor-confined containers
liskin Sep 15, 2016
60dcbee
squash! logind: fix /run/user/$UID creation in apparmor-confined cont…
liskin Sep 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/login/logind-user.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,14 +354,12 @@ static int user_mkdir_runtime_path(User *u) {

r = mount("tmpfs", u->runtime_path, "tmpfs", MS_NODEV|MS_NOSUID, t);
if (r < 0) {
if (errno != EPERM) {
if (errno != EPERM && errno != EACCES) {
r = log_error_errno(errno, "Failed to mount per-user tmpfs directory %s: %m", u->runtime_path);
goto fail;
}

/* Lacking permissions, maybe
* CAP_SYS_ADMIN-less container? In this case,
* just use a normal directory. */
log_debug_errno(errno, "Failed to mount per-user tmpfs directory %s, assuming containerized execution, ignoring: %m", u->runtime_path);

r = chmod_and_chown(u->runtime_path, 0700, u->uid, u->gid);
if (r < 0) {
Expand Down