picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

tmpfiles: only execute chmod()/chown() when needed

Browse source 
This avoids errors like this, when the paths are already there with the
correct permissions and owner:

chmod(/var/spool) failed: Read-only file system
This commit is contained in:
Michael Olbrich 2014-08-17 09:45:00 +02:00 committed by Lennart Poettering
parent 630a4d9ea7
commit 1924a97db5
1 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/tmpfiles/tmpfiles.c
View file

@ -453,35 +453,39 @@ finish:
} }
static int item_set_perms(Item *i, const char *path) { static int item_set_perms(Item *i, const char *path) {
struct stat st;
bool st_valid;
assert(i); assert(i);
assert(path); assert(path);
st_valid = stat(path, &st) == 0;
/* not using i->path directly because it may be a glob */ /* not using i->path directly because it may be a glob */
if (i->mode_set) { if (i->mode_set) {
mode_t m = i->mode; mode_t m = i->mode;
if (i->mask_perms) { if (i->mask_perms && st_valid) {
struct stat st; if (!(st.st_mode & 0111))
m &= ~0111;
if (stat(path, &st) >= 0) { if (!(st.st_mode & 0222))
if (!(st.st_mode & 0111)) m &= ~0222;
m &= ~0111; if (!(st.st_mode & 0444))
if (!(st.st_mode & 0222)) m &= ~0444;
m &= ~0222; if (!S_ISDIR(st.st_mode))
if (!(st.st_mode & 0444)) m &= ~07000; /* remove sticky/sgid/suid bit, unless directory */
m &= ~0444;
if (!S_ISDIR(st.st_mode))
m &= ~07000; /* remove sticky/sgid/suid bit, unless directory */
}
} }
if (chmod(path, m) < 0) { if (!st_valid || m != (st.st_mode & 07777)) {
log_error("chmod(%s) failed: %m", path); if (chmod(path, m) < 0) {
return -errno; log_error("chmod(%s) failed: %m", path);
return -errno;
}
} }
} }
if (i->uid_set || i->gid_set) if ((!st_valid || (i->uid != st.st_uid || i->gid != st.st_gid)) &&
(i->uid_set || i->gid_set))
if (chown(path, if (chown(path,
i->uid_set ? i->uid : (uid_t) -1, i->uid_set ? i->uid : (uid_t) -1,
i->gid_set ? i->gid : (gid_t) -1) < 0) { i->gid_set ? i->gid : (gid_t) -1) < 0) {