daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
803fb7
From b0a6aa4de054e69213d0902094a1ae85fe2c5e58 Mon Sep 17 00:00:00 2001
803fb7
From: Seth Jennings <sjenning@redhat.com>
803fb7
Date: Tue, 5 May 2015 13:31:01 -0500
803fb7
Subject: [PATCH] Fix permissions on /run/systemd/nspawn/locks
803fb7
803fb7
machined is getting an EACCES when trying to create the lock file for
803fb7
images because the mode on /run/systemd/nspawn/locks is 0600.
803fb7
803fb7
mkdir("/run/systemd/nspawn/locks", 0600) = -1 EEXIST (File exists)
803fb7
stat("/run/systemd/nspawn/locks", {st_mode=S_IFDIR|0600, st_size=40, ...}) = 0
803fb7
open("/run/systemd/nspawn/locks/inode-41:256", O_RDWR|O_CREAT|O_NOCTTY|O_NOFOLLOW|O_CLOEXEC, 0600) = -1 EACCES (Permission denied)
803fb7
803fb7
This commit adjusts the mode to 0700 to correct the issue.
803fb7
803fb7
(cherry picked from commit 7e7cddb22493642dad826ec42ac00979f40b2d17)
803fb7
803fb7
Cherry-picked from: 7e7cddb
803fb7
Resolves: #1222517
803fb7
---
803fb7
 src/shared/machine-image.c | 4 ++--
803fb7
 1 file changed, 2 insertions(+), 2 deletions(-)
803fb7
803fb7
diff --git a/src/shared/machine-image.c b/src/shared/machine-image.c
803fb7
index 8d61507e8..c02ee814c 100644
803fb7
--- a/src/shared/machine-image.c
803fb7
+++ b/src/shared/machine-image.c
803fb7
@@ -601,7 +601,7 @@ int image_path_lock(const char *path, int operation, LockFile *global, LockFile
803fb7
                 return r;
803fb7
 
803fb7
         if (p) {
803fb7
-                mkdir_p("/run/systemd/nspawn/locks", 0600);
803fb7
+                mkdir_p("/run/systemd/nspawn/locks", 0700);
803fb7
 
803fb7
                 r = make_lock_file(p, operation, global);
803fb7
                 if (r < 0) {
803fb7
@@ -628,7 +628,7 @@ int image_name_lock(const char *name, int operation, LockFile *ret) {
803fb7
         if (streq(name, ".host"))
803fb7
                 return -EBUSY;
803fb7
 
803fb7
-        mkdir_p("/run/systemd/nspawn/locks", 0600);
803fb7
+        mkdir_p("/run/systemd/nspawn/locks", 0700);
803fb7
         p = strjoina("/run/systemd/nspawn/locks/name-", name);
803fb7
 
803fb7
         return make_lock_file(p, operation, ret);