SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tree-wide: bunch of fixlets raised by coverity (#38341)

Browse Source
This commit is contained in:
Luca Boccassi
2025-07-26 11:10:00 +01:00
committed by GitHub
parent 7157c7c4a5 08cf7c70b9
commit b5a7f13a42
11 changed files with 64 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/fs-util.h
+6 -2
View File
@@ -6,8 +6,12 @@
/* The following macros add 1 when converting things, since 0 is a valid mode, while the pointer
* NULL is special */
#define PTR_TO_MODE(p) ((mode_t) ((uintptr_t) (p)-1))
#define MODE_TO_PTR(u) ((void *) ((uintptr_t) (u)+1))
static inline mode_t PTR_TO_MODE(void *p) {
return p ? (mode_t) ((uintptr_t) p - 1) : MODE_INVALID;
}
static inline void* MODE_TO_PTR(mode_t m) {
return m == MODE_INVALID ? NULL : (void *) ((uintptr_t) m + 1);
}
int rmdir_parents(const char *path, const char *stop);
src/basic/ordered-set.c
+6 -6
View File
@@ -61,7 +61,7 @@ int ordered_set_put_strdup_full(OrderedSet **s, const struct hash_ops *hash_ops,
}
int ordered_set_put_strdupv_full(OrderedSet **s, const struct hash_ops *hash_ops, char **l) {
int n = 0, r;
int r, ret = 0;
assert(s);
@@ -70,14 +70,14 @@ int ordered_set_put_strdupv_full(OrderedSet **s, const struct hash_ops *hash_ops
if (r < 0)
return r;
n += r;
ret = ret || r > 0;
}
return n;
return ret;
}
int ordered_set_put_string_set_full(OrderedSet **s, const struct hash_ops *hash_ops, OrderedSet *l) {
int n = 0, r;
int r, ret = 0;
char *p;
assert(s);
@@ -89,10 +89,10 @@ int ordered_set_put_string_set_full(OrderedSet **s, const struct hash_ops *hash_
if (r < 0)
return r;
n += r;
ret = ret || r > 0;
}
return n;
return ret;
}
void ordered_set_print(FILE *f, const char *field, OrderedSet *s) {
src/boot/fuzz-efi-string.c
+4 -2
View File
@@ -31,10 +31,12 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
DO_NOT_OPTIMIZE(parse_number8(str8, &(uint64_t){ 0 }, size % 2 == 0 ? NULL : &tail8));
const char16_t *tail16 = NULL;
_cleanup_free_ char16_t *str16 = memdup_str16(data, size);
_cleanup_free_ char16_t *str16 = ASSERT_SE_PTR(memdup_str16(data, size));
DO_NOT_OPTIMIZE(parse_number16(str16, &(uint64_t){ 0 }, size % 2 == 0 ? NULL : &tail16));
_cleanup_free_ char16_t *pattern = memdup_str16(data, len), *haystack = memdup_str16(data + len, len2);
_cleanup_free_ char16_t
*pattern = ASSERT_SE_PTR(memdup_str16(data, len)),
*haystack = ASSERT_SE_PTR(memdup_str16(data + len, len2));
DO_NOT_OPTIMIZE(efi_fnmatch(pattern, haystack));
return 0;
src/core/exec-invoke.c
+4 -1
View File
@@ -2244,8 +2244,11 @@ static int setup_private_users_child(int unshare_ready_fd, const char *uid_map,
/* Wait until the parent unshared the user namespace */
uint64_t c;
if (read(unshare_ready_fd, &c, sizeof(c)) < 0)
ssize_t n = read(unshare_ready_fd, &c, sizeof(c));
if (n < 0)
return log_debug_errno(errno, "Failed to read from signaling eventfd: %m");
if (n != sizeof(c))
return log_debug_errno(SYNTHETIC_ERRNO(EIO), "Short read from signaling eventfd.");
/* Disable the setgroups() system call in the child user namespace, for good, unless PrivateUsers=full
* and using the system service manager. */
src/delta/delta.c
+2
View File
@@ -286,6 +286,8 @@ static int enumerate_dir_d(
log_debug("Adding to drops: %s %s %s %s %s/%s",
unit, glyph(GLYPH_ARROW_RIGHT), *file, glyph(GLYPH_ARROW_RIGHT), path, *file);
r = path_put(&h, path, *file, /* override = */ false);
if (r < 0)
return r;
}
return 0;
}
src/resolve/resolved-dns-browse-services.c
+1 -1
View File
@@ -198,7 +198,7 @@ int dns_add_new_service(DnsServiceBrowser *sb, DnsResourceRecord *rr, int owner_
/* If next_time is still in the past, the service is being added
* after it has already expired. Just schedule a 100%
* maintenance query. */
next_time = usec + USEC_PER_SEC;
next_time = usec_add(usec, USEC_PER_SEC);
s->rr_ttl_state = DNS_RECORD_TTL_STATE_100_PERCENT;
}
src/shared/cpu-set-util.c
+5 -3
View File
@@ -133,8 +133,10 @@ int cpu_set_realloc(CPUSet *c, size_t n) {
return -ERANGE;
n = CPU_ALLOC_SIZE(n);
if (n <= c->allocated)
if (n <= c->allocated) {
assert(c->set || n == 0);
return 0;
}
if (!GREEDY_REALLOC0(c->set, DIV_ROUND_UP(n, sizeof(cpu_set_t))))
return -ENOMEM;
@@ -177,7 +179,7 @@ int cpu_set_add_set(CPUSet *c, const CPUSet *src) {
return 1;
}
static int cpu_set_add_range(CPUSet *c, size_t start, size_t end) {
int cpu_set_add_range(CPUSet *c, size_t start, size_t end) {
int r;
assert(c);
@@ -222,7 +224,7 @@ int config_parse_cpu_set(
void *userdata) {
CPUSet *c = ASSERT_PTR(data);
int r, level = ltype ? LOG_DEBUG : LOG_DEBUG;
int r, level = ltype ? LOG_DEBUG : LOG_ERR;
bool critical = ltype;
assert(critical || lvalue);
src/shared/cpu-set-util.h
+1
View File
@@ -24,6 +24,7 @@ void cpu_set_done(CPUSet *c);
int cpu_set_realloc(CPUSet *c, size_t n);
int cpu_set_add(CPUSet *c, size_t i);
int cpu_set_add_set(CPUSet *c, const CPUSet *src);
int cpu_set_add_range(CPUSet *c, size_t start, size_t end);
int cpu_set_add_all(CPUSet *c);
char* cpu_set_to_string(const CPUSet *c);
src/shared/install.c
+4 -9
View File
@@ -3350,8 +3350,7 @@ static int read_presets(RuntimeScope scope, const char *root_dir, UnitFilePreset
if (strchr(COMMENTS, line[0]))
continue;
parameter = first_word(line, "enable");
if (parameter) {
if ((parameter = first_word(line, "enable"))) {
char *unit_name;
char **instances = NULL;
@@ -3367,10 +3366,8 @@ static int read_presets(RuntimeScope scope, const char *root_dir, UnitFilePreset
.action = PRESET_ENABLE,
.instances = instances,
};
}
parameter = first_word(line, "disable");
if (parameter) {
} else if ((parameter = first_word(line, "disable"))) {
char *pattern;
pattern = strdup(parameter);
@@ -3381,10 +3378,8 @@ static int read_presets(RuntimeScope scope, const char *root_dir, UnitFilePreset
.pattern = pattern,
.action = PRESET_DISABLE,
};
}
parameter = first_word(line, "ignore");
if (parameter) {
} else if ((parameter = first_word(line, "ignore"))) {
char *pattern;
pattern = strdup(parameter);
@@ -3397,7 +3392,7 @@ static int read_presets(RuntimeScope scope, const char *root_dir, UnitFilePreset
};
}
if (rule.action) {
if (rule.action != 0) {
if (!GREEDY_REALLOC(ps.rules, ps.n_rules + 1))
return -ENOMEM;
src/test/test-cpu-set-util.c
+21
View File
@@ -262,4 +262,25 @@ TEST(print_cpu_alloc_size) {
log_info("CPU_ALLOC_SIZE(8191) = %zu", CPU_ALLOC_SIZE(8191));
}
TEST(cpu_set_add) {
_cleanup_(cpu_set_done) CPUSet c = {};
for (size_t i = 0; i < 8192; i++)
ASSERT_OK(cpu_set_add(&c, 8191));
ASSERT_ERROR(cpu_set_add(&c, 8192), ERANGE);
ASSERT_ERROR(cpu_set_add(&c, SIZE_MAX), ERANGE);
}
TEST(cpu_set_add_range) {
_cleanup_(cpu_set_done) CPUSet c = {};
ASSERT_ERROR(cpu_set_add_range(&c, 0, 8192), ERANGE);
ASSERT_ERROR(cpu_set_add_range(&c, 0, SIZE_MAX), ERANGE);
ASSERT_SIGNAL(cpu_set_add_range(&c, 100, 0), SIGABRT);
ASSERT_OK(cpu_set_add_range(&c, 0, 0));
ASSERT_OK(cpu_set_add_range(&c, 0, 8191));
}
DEFINE_TEST_MAIN(LOG_DEBUG);
src/test/test-ordered-set.c
+10 -9
View File
@@ -90,18 +90,19 @@ TEST(set_put_string_set) {
_cleanup_ordered_set_free_ OrderedSet *m = NULL, *q = NULL;
_cleanup_free_ char **final = NULL; /* "just free" because the strings are in the set */
assert_se(ordered_set_put_strdup(&m, "1") == 1);
assert_se(ordered_set_put_strdup(&m, "22") == 1);
assert_se(ordered_set_put_strdup(&m, "333") == 1);
ASSERT_OK_POSITIVE(ordered_set_put_strdup(&m, "1"));
ASSERT_OK_POSITIVE(ordered_set_put_strdup(&m, "22"));
ASSERT_OK_POSITIVE(ordered_set_put_strdup(&m, "333"));
assert_se(ordered_set_put_strdup(&q, "11") == 1);
assert_se(ordered_set_put_strdup(&q, "22") == 1);
assert_se(ordered_set_put_strdup(&q, "33") == 1);
ASSERT_OK_POSITIVE(ordered_set_put_strdup(&q, "11"));
ASSERT_OK_POSITIVE(ordered_set_put_strdup(&q, "22"));
ASSERT_OK_POSITIVE(ordered_set_put_strdup(&q, "33"));
assert_se(ordered_set_put_string_set(&m, q) == 2);
ASSERT_OK_POSITIVE(ordered_set_put_string_set(&m, q));
ASSERT_OK_ZERO(ordered_set_put_string_set(&m, q));
assert_se(final = ordered_set_get_strv(m));
assert_se(strv_equal(final, STRV_MAKE("1", "22", "333", "11", "33")));
ASSERT_NOT_NULL(final = ordered_set_get_strv(m));
ASSERT_TRUE(strv_equal(final, STRV_MAKE("1", "22", "333", "11", "33")));
ordered_set_print(stdout, "BAR=", m);
}