morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-15 08:56:15 +09:00
Code Issues Packages Projects Releases Wiki Activity

capability-util: tighten requirement for CAP_LAST_CAP off by one

Browse Source 
Otherwise, we cannot use UINT64_MAX as 'unset'.
This commit is contained in:
Yu Watanabe
2025-10-24 01:52:02 +09:00
parent 2a6b084cc6
commit 4c0cdc4a2c
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/basic/capability-util.h
View File

@@ -8,7 +8,6 @@
/* Special marker used when storing a capabilities mask as "unset". This would need to be updated as soon as
* Linux learns more than 63 caps. */
#define CAP_MASK_UNSET UINT64_MAX
assert_cc(CAP_LAST_CAP < 64);
/* All possible capabilities bits on */
#define CAP_MASK_ALL UINT64_C(0x7fffffffffffffff)
@@ -16,6 +15,7 @@ assert_cc(CAP_LAST_CAP < 64);
/* The largest capability we can deal with, given we want to be able to store cap masks in uint64_t but still
* be able to use UINT64_MAX as indicator for "not set". The latter makes capability 63 unavailable. */
#define CAP_LIMIT 62
assert_cc(CAP_LAST_CAP <= CAP_LIMIT);
static inline bool capability_is_set(uint64_t v) {
return v != CAP_MASK_UNSET;

8
src/test/test-capability-util.c
View File

@@ -241,11 +241,9 @@ static void test_ensure_cap_64_bit(void) {
ASSERT_OK(safe_atolu(content, &p));
/* If caps don't fit into 64-bit anymore, we have a problem, fail the test. */
assert_se(p <= 63);
/* Also check for the header definition */
assert_cc(CAP_LAST_CAP <= 63);
/* If caps don't fit into 64-bit anymore, we have a problem, fail the test. Moreover, we use
* UINT64_MAX as unset, hence it must be smaller than or equals to 62 (CAP_LIMIT). */
assert_se(p <= CAP_LIMIT);
}
static void test_capability_get_ambient(void) {