shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-10-28 03:25:31 +03:00
Code

acl-util: fix error handling in add_acls_for_user()

Browse Source
This commit is contained in:
Lennart Poettering 2020-07-21 22:19:17 +02:00
parent 002674387c
commit 2ea6247e01
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/shared/acl-util.c
View File

@ -378,10 +378,13 @@ int acls_for_file(const char *path, acl_type_t type, acl_t new, acl_t *acl) {
int add_acls_for_user(int fd, uid_t uid) { int add_acls_for_user(int fd, uid_t uid) {
_cleanup_(acl_freep) acl_t acl = NULL; _cleanup_(acl_freep) acl_t acl = NULL;
acl_entry_t entry;
acl_permset_t permset; acl_permset_t permset;
acl_entry_t entry;
int r; int r;
assert(fd >= 0);
assert(uid_is_valid(uid));
acl = acl_get_fd(fd); acl = acl_get_fd(fd);
if (!acl) if (!acl)
return -errno; return -errno;
@ -394,8 +397,8 @@ int add_acls_for_user(int fd, uid_t uid) {
return -errno; return -errno;
} }
/* We do not recalculate the mask unconditionally here, /* We do not recalculate the mask unconditionally here, so that the fchmod() mask above stays
* so that the fchmod() mask above stays intact. */ * intact. */
if (acl_get_permset(entry, &permset) < 0 || if (acl_get_permset(entry, &permset) < 0 ||
acl_add_perm(permset, ACL_READ) < 0) acl_add_perm(permset, ACL_READ) < 0)
return -errno; return -errno;
@ -404,5 +407,8 @@ int add_acls_for_user(int fd, uid_t uid) {
if (r < 0) if (r < 0)
return r; return r;
return acl_set_fd(fd, acl); if (acl_set_fd(fd, acl) < 0)
return -errno;
return 0;
} }