diff options
| author | Lennart Poettering <lennart@poettering.net> | 2020-09-09 20:35:33 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-09-11 20:10:27 +0200 |
| commit | 57fc184a6cf8433b5fb353c699b1d3866c93062a (patch) | |
| tree | 6788ca761f223f54ddbddbae42544914106265db | |
| parent | db0f031e7042dbc26f9075244e8739f281ec9aa5 (diff) | |
| download | systemd-57fc184a6cf8433b5fb353c699b1d3866c93062a.tar.gz | |
fs-util,tmpfiles: fix error handling of fchmod_opath()
When 4dfaa528d45 was first commited its callers relied on `errno` instead of the
return value for error reporting. Which worked fine, since internally
under all conditions base were set — even if ugly and not inline with
our coding style. Things then got broken in
f8606626ed3c2582e06543550d58fe9886cdca5f where suddenly additional
syscalls might end up being done in the function, thus corrupting `errno`.
(cherry picked from commit dee00c1939c6194404c15a80650d0c04bb01b0db)
| -rw-r--r-- | src/basic/fs-util.c | 17 | ||||
| -rw-r--r-- | src/tmpfiles/tmpfiles.c | 11 |
2 files changed, 18 insertions, 10 deletions
diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c index 34a2260783..461bc04e50 100644 --- a/src/basic/fs-util.c +++ b/src/basic/fs-util.c @@ -229,6 +229,7 @@ int chmod_and_chown(const char *path, mode_t mode, uid_t uid, gid_t gid) { int fchmod_and_chown(int fd, mode_t mode, uid_t uid, gid_t gid) { bool do_chown, do_chmod; struct stat st; + int r; /* Change ownership and access mode of the specified fd. Tries to do so safely, ensuring that at no * point in time the access mode is above the old access mode under the old ownership or the new @@ -259,18 +260,22 @@ int fchmod_and_chown(int fd, mode_t mode, uid_t uid, gid_t gid) { if (do_chown && do_chmod) { mode_t minimal = st.st_mode & mode; /* the subset of the old and the new mask */ - if (((minimal ^ st.st_mode) & 07777) != 0) - if (fchmod_opath(fd, minimal & 07777) < 0) - return -errno; + if (((minimal ^ st.st_mode) & 07777) != 0) { + r = fchmod_opath(fd, minimal & 07777); + if (r < 0) + return r; + } } if (do_chown) if (fchownat(fd, "", uid, gid, AT_EMPTY_PATH) < 0) return -errno; - if (do_chmod) - if (fchmod_opath(fd, mode & 07777) < 0) - return -errno; + if (do_chmod) { + r = fchmod_opath(fd, mode & 07777); + if (r < 0) + return r; + } return do_chown || do_chmod; } diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c index 2404e36bf2..2db3773fcb 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -773,6 +773,7 @@ static int fd_set_perms(Item *i, int fd, const char *path, const struct stat *st struct stat stbuf; mode_t new_mode; bool do_chown; + int r; assert(i); assert(fd); @@ -818,8 +819,9 @@ static int fd_set_perms(Item *i, int fd, const char *path, const struct stat *st log_debug("\"%s\" matches temporary mode %o already.", path, m); else { log_debug("Temporarily changing \"%s\" to mode %o.", path, m); - if (fchmod_opath(fd, m) < 0) - return log_error_errno(errno, "fchmod() of %s failed: %m", path); + r = fchmod_opath(fd, m); + if (r < 0) + return log_error_errno(r, "fchmod() of %s failed: %m", path); } } } @@ -850,8 +852,9 @@ static int fd_set_perms(Item *i, int fd, const char *path, const struct stat *st log_debug("\"%s\" matches mode %o already.", path, new_mode); else { log_debug("Changing \"%s\" to mode %o.", path, new_mode); - if (fchmod_opath(fd, new_mode) < 0) - return log_error_errno(errno, "fchmod() of %s failed: %m", path); + r = fchmod_opath(fd, new_mode); + if (r < 0) + return log_error_errno(r, "fchmod() of %s failed: %m", path); } } } |