shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-09 09:57:26 +03:00
Code

Merge pull request #18763 from poettering/cov-fixes

Browse Source 
A bunch of coverity fixes
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2021-02-23 18:41:53 +01:00 committed by GitHub
commit 0892c3b2eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/execute.c
View File

@ -3202,11 +3202,16 @@ static int apply_mount_namespace(
if (MANAGER_IS_SYSTEM(u->manager)) {
propagate_dir = path_join("/run/systemd/propagate/", u->id);
if (!propagate_dir)
return -ENOMEM;
if (!propagate_dir) {
r = -ENOMEM;
goto finalize;
}
incoming_dir = strdup("/run/systemd/incoming");
if (!incoming_dir)
return -ENOMEM;
if (!incoming_dir) {
r = -ENOMEM;
goto finalize;
}
}
r = setup_namespace(root_dir, root_image, context->root_image_options,

2
src/libsystemd-network/icmp6-util.c
View File

@ -162,7 +162,7 @@ int icmp6_receive(int fd, void *buffer, size_t size, struct in6_addr *ret_dst,
};
struct cmsghdr *cmsg;
struct in6_addr addr = {};
triple_timestamp t;
triple_timestamp t = {};
ssize_t len;
iov = IOVEC_MAKE(buffer, size);

6
src/resolve/resolved-dns-transaction.c
View File

@ -121,10 +121,10 @@ DnsTransaction* dns_transaction_free(DnsTransaction *t) {
}
LIST_REMOVE(transactions_by_scope, t->scope->transactions, t);
}
if (t->id != 0)
hashmap_remove(t->scope->manager->dns_transactions, UINT_TO_PTR(t->id));
if (t->id != 0)
hashmap_remove(t->scope->manager->dns_transactions, UINT_TO_PTR(t->id));
}
while ((c = set_steal_first(t->notify_query_candidates)))
set_remove(c->transactions, t);

8
src/resolve/resolved-manager.c
View File

@ -548,7 +548,13 @@ static int manager_watch_hostname(Manager *m) {
r = determine_hostname(&m->full_hostname, &m->llmnr_hostname, &m->mdns_hostname);
if (r < 0) {
log_info("Defaulting to hostname '%s'.", fallback_hostname());
_cleanup_free_ char *d = NULL;
d = fallback_hostname();
if (!d)
return log_oom();
log_info("Defaulting to hostname '%s'.", d);
r = make_fallback_hostnames(&m->full_hostname, &m->llmnr_hostname, &m->mdns_hostname);
if (r < 0)

10
src/shared/dissect-image.c
View File

@ -2280,8 +2280,11 @@ int dissected_image_acquire_metadata(DissectedImage *m) {
log_debug("No image name available, will skip extension-release metadata");
for (; n_meta_initialized < _META_MAX; n_meta_initialized ++) {
if (!paths[n_meta_initialized])
if (!paths[n_meta_initialized]) {
fds[2*n_meta_initialized] = fds[2*n_meta_initialized+1] = -1;
continue;
}
if (pipe2(fds + 2*n_meta_initialized, O_CLOEXEC) < 0) {
r = -errno;
goto finish;
@ -2435,11 +2438,8 @@ int dissected_image_acquire_metadata(DissectedImage *m) {
strv_free_and_replace(m->extension_release, extension_release);
finish:
for (k = 0; k < n_meta_initialized; k++) {
if (!paths[k])
continue;
for (k = 0; k < n_meta_initialized; k++)
safe_close_pair(fds + 2*k);
}
return r;
}

5
src/shared/serialize.c
View File

@ -175,7 +175,7 @@ int deserialize_dual_timestamp(const char *value, dual_timestamp *t) {
}
int deserialize_environment(const char *value, char ***list) {
char *unescaped;
_cleanup_free_ char *unescaped = NULL;
int r;
assert(value);
@ -187,9 +187,10 @@ int deserialize_environment(const char *value, char ***list) {
if (r < 0)
return log_error_errno(r, "Failed to unescape: %m");
r = strv_env_replace_consume(list, unescaped);
r = strv_env_replace_consume(list, TAKE_PTR(unescaped));
if (r < 0)
return log_error_errno(r, "Failed to append environment variable: %m");
return 0;
}