chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update TODO
[elogind.git]
/
src
/
shared
/
capability.c
diff --git
a/src/shared/capability.c
b/src/shared/capability.c
index f7513379a2c9f2c18cb43a1b194d18cca56f9740..5d156ab3cd62e95f44f2347b309ca6ad3daf566e 100644
(file)
--- a/
src/shared/capability.c
+++ b/
src/shared/capability.c
@@
-227,37
+227,25
@@
int drop_privileges(uid_t uid, gid_t gid, uint64_t keep_capabilities) {
* binary has the capability configured in the file system,
* which we want to avoid. */
* binary has the capability configured in the file system,
* which we want to avoid. */
- if (setresgid(gid, gid, gid) < 0) {
- log_error("Failed to change group ID: %m");
- return -errno;
- }
+ if (setresgid(gid, gid, gid) < 0)
+ return log_error_errno(errno, "Failed to change group ID: %m");
- if (setgroups(0, NULL) < 0) {
- log_error("Failed to drop auxiliary groups list: %m");
- return -errno;
- }
+ if (setgroups(0, NULL) < 0)
+ return log_error_errno(errno, "Failed to drop auxiliary groups list: %m");
- if (prctl(PR_SET_KEEPCAPS, 1) < 0) {
- log_error("Failed to enable keep capabilities flag: %m");
- return -errno;
- }
+ if (prctl(PR_SET_KEEPCAPS, 1) < 0)
+ return log_error_errno(errno, "Failed to enable keep capabilities flag: %m");
r = setresuid(uid, uid, uid);
r = setresuid(uid, uid, uid);
- if (r < 0) {
- log_error("Failed to change user ID: %m");
- return -errno;
- }
+ if (r < 0)
+ return log_error_errno(errno, "Failed to change user ID: %m");
- if (prctl(PR_SET_KEEPCAPS, 0) < 0) {
- log_error("Failed to disable keep capabilities flag: %m");
- return -errno;
- }
+ if (prctl(PR_SET_KEEPCAPS, 0) < 0)
+ return log_error_errno(errno, "Failed to disable keep capabilities flag: %m");
r = capability_bounding_set_drop(~keep_capabilities, true);
r = capability_bounding_set_drop(~keep_capabilities, true);
- if (r < 0) {
- log_error_errno(-r, "Failed to drop capabilities: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to drop capabilities: %m");
d = cap_init();
if (!d)
d = cap_init();
if (!d)
@@
-273,15
+261,13
@@
int drop_privileges(uid_t uid, gid_t gid, uint64_t keep_capabilities) {
if (cap_set_flag(d, CAP_EFFECTIVE, j, bits, CAP_SET) < 0 ||
cap_set_flag(d, CAP_PERMITTED, j, bits, CAP_SET) < 0) {
if (cap_set_flag(d, CAP_EFFECTIVE, j, bits, CAP_SET) < 0 ||
cap_set_flag(d, CAP_PERMITTED, j, bits, CAP_SET) < 0) {
- log_error
(
"Failed to enable capabilities bits: %m");
+ log_error
_errno(errno,
"Failed to enable capabilities bits: %m");
return -errno;
}
}
return -errno;
}
}
- if (cap_set_proc(d) < 0) {
- log_error("Failed to increase capabilities: %m");
- return -errno;
- }
+ if (cap_set_proc(d) < 0)
+ return log_error_errno(errno, "Failed to increase capabilities: %m");
return 0;
}
return 0;
}