shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-21 02:50:18 +03:00
Code

chown-recursive: also check mode before we bypass

Browse Source
This commit is contained in:
Lennart Poettering 2019-04-16 18:44:12 +02:00 committed by Zbigniew Jędrzejewski-Szmek
parent cbb3092ce6
commit 85318688cc
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/chown-recursive.c
View File

@ -133,17 +133,17 @@ int path_chown_recursive(
if (fd < 0)
return -errno;
if (!uid_is_valid(uid) && !gid_is_valid(gid))
if (!uid_is_valid(uid) && !gid_is_valid(gid) && (mask & 07777) == 07777)
return 0; /* nothing to do */
if (fstat(fd, &st) < 0)
return -errno;
/* Let's take a shortcut: if the top-level directory is properly owned, we don't descend into the whole tree,
* under the assumption that all is OK anyway. */
/* Let's take a shortcut: if the top-level directory is properly owned, we don't descend into the
* whole tree, under the assumption that all is OK anyway. */
if ((!uid_is_valid(uid) || st.st_uid == uid) &&
(!gid_is_valid(gid) || st.st_gid == gid))
(!gid_is_valid(gid) || st.st_gid == gid) &&
((st.st_mode & ~mask & 07777) == 0))
return 0;
return chown_recursive_internal(TAKE_FD(fd), &st, uid, gid, mask); /* we donate the fd to the call, regardless if it succeeded or failed */