picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sd-bus: call cap_last_cap() only once in has_cap() 

Also, use the same type everywhere for dealing with it.
This commit is contained in:
Lennart Poettering 2018-10-10 11:12:54 +02:00
parent 3cae6c21e7
commit 92a40e20bf
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/libsystemd/sd-bus/bus-creds.c
View File

@ -650,16 +650,19 @@ _public_ int sd_bus_creds_get_description(sd_bus_creds *c, const char **ret) {
}
static int has_cap(sd_bus_creds *c, size_t offset, int capability) {
unsigned long lc;
size_t sz;
assert(c);
assert(capability >= 0);
assert(c->capability);
if ((unsigned) capability > cap_last_cap())
lc = cap_last_cap();
if ((unsigned long) capability > lc)
return 0;
sz = DIV_ROUND_UP(cap_last_cap(), 32U);
sz = DIV_ROUND_UP(lc, 32LU);
return !!(c->capability[offset * sz + CAP_TO_INDEX((uint32_t) capability)] & CAP_TO_MASK_CORRECTED((uint32_t) capability));
}