chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3d06f41
)
shared: allow drop_priviliges to drop all privs
author
Tom Gundersen
<teg@jklm.no>
Tue, 3 Jun 2014 09:06:14 +0000
(11:06 +0200)
committer
Tom Gundersen
<teg@jklm.no>
Tue, 3 Jun 2014 09:35:29 +0000
(11:35 +0200)
src/shared/capability.c
patch
|
blob
|
history
diff --git
a/src/shared/capability.c
b/src/shared/capability.c
index 69e054b1ff55df5140595e8c2b8644796b5b35f4..58270ad8cc250e1c14a45e4be4acb901628e5b3a 100644
(file)
--- a/
src/shared/capability.c
+++ b/
src/shared/capability.c
@@
-214,10
+214,10
@@
int capability_bounding_set_drop_usermode(uint64_t drop) {
return r;
}
return r;
}
-int drop_privileges(uid_t uid, gid_t gid, uint64_t keep_capabilites) {
+int drop_privileges(uid_t uid, gid_t gid, uint64_t keep_capabilit
i
es) {
_cleanup_cap_free_ cap_t d = NULL;
_cleanup_cap_free_ cap_t d = NULL;
- cap_value_t bits[sizeof(keep_capabilites)*8];
+ cap_value_t bits[sizeof(keep_capabilit
i
es)*8];
unsigned i, j = 0;
int r;
unsigned i, j = 0;
int r;
@@
-254,7
+254,7
@@
int drop_privileges(uid_t uid, gid_t gid, uint64_t keep_capabilites) {
return -errno;
}
return -errno;
}
- r = capability_bounding_set_drop(~keep_capabilites, true);
+ r = capability_bounding_set_drop(~keep_capabilit
i
es, true);
if (r < 0) {
log_error("Failed to drop capabilities: %s", strerror(-r));
return r;
if (r < 0) {
log_error("Failed to drop capabilities: %s", strerror(-r));
return r;
@@
-264,14
+264,16
@@
int drop_privileges(uid_t uid, gid_t gid, uint64_t keep_capabilites) {
if (!d)
return log_oom();
if (!d)
return log_oom();
- for (i = 0; i < sizeof(keep_capabilites)*8; i++)
- if (keep_capabilites & (1ULL << i))
+ for (i = 0; i < sizeof(keep_capabilit
i
es)*8; i++)
+ if (keep_capabilit
i
es & (1ULL << i))
bits[j++] = i;
bits[j++] = i;
- 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");
- return -errno;
+ if (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) {
+ log_error("Failed to enable capabilities bits: %m");
+ return -errno;
+ }
}
if (cap_set_proc(d) < 0) {
}
if (cap_set_proc(d) < 0) {