We recently started making more use of malloc_usable_size() and rely on it (see the string_erase() story). Given that we don't really support sytems where malloc_usable_size() cannot be trusted beyond statistics anyway, let's go fully in and rework GREEDY_REALLOC() on top of it: instead of passing around and maintaining the currenly allocated size everywhere, let's just derive it automatically from malloc_usable_size(). I am mostly after this for the simplicity this brings. It also brings minor efficiency improvements I guess, but things become so much nicer to look at if we can avoid these allocation size variables everywhere. Note that the malloc_usable_size() man page says relying on it wasn't "good programming practice", but I think it does this for reasons that don't apply here: the greedy realloc logic specifically doesn't rely on the returned extra size, beyond the fact that it is equal or larger than what was requested. (This commit was supposed to be a quick patch btw, but apparently we use the greedy realloc stuff quite a bit across the codebase, so this ends up touching *a*lot* of code.)
123 lines
3.1 KiB
C
123 lines
3.1 KiB
C
/* SPDX-License-Identifier: LGPL-2.1-or-later */
|
|
|
|
#include <errno.h>
|
|
#include <string.h>
|
|
|
|
#include "alloc-util.h"
|
|
#include "capability-util.h"
|
|
#include "cap-list.h"
|
|
#include "extract-word.h"
|
|
#include "macro.h"
|
|
#include "parse-util.h"
|
|
#include "stdio-util.h"
|
|
#include "util.h"
|
|
|
|
static const struct capability_name* lookup_capability(register const char *str, register GPERF_LEN_TYPE len);
|
|
|
|
#include "cap-from-name.h"
|
|
#include "cap-to-name.h"
|
|
|
|
const char *capability_to_name(int id) {
|
|
if (id < 0)
|
|
return NULL;
|
|
|
|
if ((size_t) id >= ELEMENTSOF(capability_names))
|
|
return NULL;
|
|
|
|
return capability_names[id];
|
|
}
|
|
|
|
int capability_from_name(const char *name) {
|
|
const struct capability_name *sc;
|
|
int r, i;
|
|
|
|
assert(name);
|
|
|
|
/* Try to parse numeric capability */
|
|
r = safe_atoi(name, &i);
|
|
if (r >= 0) {
|
|
if (i >= 0 && i < 64)
|
|
return i;
|
|
else
|
|
return -EINVAL;
|
|
}
|
|
|
|
/* Try to parse string capability */
|
|
sc = lookup_capability(name, strlen(name));
|
|
if (!sc)
|
|
return -EINVAL;
|
|
|
|
return sc->id;
|
|
}
|
|
|
|
/* This is the number of capability names we are *compiled* with.
|
|
* For the max capability number of the currently-running kernel,
|
|
* use cap_last_cap(). */
|
|
int capability_list_length(void) {
|
|
return (int) ELEMENTSOF(capability_names);
|
|
}
|
|
|
|
int capability_set_to_string_alloc(uint64_t set, char **s) {
|
|
_cleanup_free_ char *str = NULL;
|
|
size_t n = 0;
|
|
|
|
assert(s);
|
|
|
|
for (unsigned i = 0; i <= cap_last_cap(); i++)
|
|
if (set & (UINT64_C(1) << i)) {
|
|
const char *p;
|
|
char buf[2 + 16 + 1];
|
|
size_t add;
|
|
|
|
p = capability_to_name(i);
|
|
if (!p) {
|
|
xsprintf(buf, "0x%x", i);
|
|
p = buf;
|
|
}
|
|
|
|
add = strlen(p);
|
|
|
|
if (!GREEDY_REALLOC(str, n + add + 2))
|
|
return -ENOMEM;
|
|
|
|
strcpy(mempcpy(str + n, p, add), " ");
|
|
n += add + 1;
|
|
}
|
|
|
|
if (!GREEDY_REALLOC(str, n + 1))
|
|
return -ENOMEM;
|
|
|
|
str[n > 0 ? n - 1 : 0] = '\0'; /* truncate the last space, if it's there */
|
|
|
|
*s = TAKE_PTR(str);
|
|
|
|
return 0;
|
|
}
|
|
|
|
int capability_set_from_string(const char *s, uint64_t *set) {
|
|
uint64_t val = 0;
|
|
|
|
assert(set);
|
|
|
|
for (const char *p = s;;) {
|
|
_cleanup_free_ char *word = NULL;
|
|
int r;
|
|
|
|
r = extract_first_word(&p, &word, NULL, EXTRACT_UNQUOTE);
|
|
if (r == -ENOMEM)
|
|
return r;
|
|
if (r <= 0)
|
|
break;
|
|
|
|
r = capability_from_name(word);
|
|
if (r < 0)
|
|
continue;
|
|
|
|
val |= ((uint64_t) UINT64_C(1)) << (uint64_t) r;
|
|
}
|
|
|
|
*set = val;
|
|
|
|
return 0;
|
|
}
|