From 47eab95ea813fdeee686ca720287b7fe4189b2d4 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 7 May 2024 13:13:24 +0200 Subject: [PATCH 01/18] journal-remote-main: pass the right error variable --- src/journal-remote/journal-remote-main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c index 64f8125df3..34d4062d4a 100644 --- a/src/journal-remote/journal-remote-main.c +++ b/src/journal-remote/journal-remote-main.c @@ -108,7 +108,7 @@ static int spawn_child(const char* child, char** argv) { r = fd_nonblock(fd[0], true); if (r < 0) - log_warning_errno(errno, "Failed to set child pipe to non-blocking: %m"); + log_warning_errno(r, "Failed to set child pipe to non-blocking: %m"); return fd[0]; } From bad6cb5ae8db5d03ded4c852d624014c8738cc7b Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 7 May 2024 13:16:30 +0200 Subject: [PATCH 02/18] bless-boot: pass the right error variable --- src/boot/bless-boot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/boot/bless-boot.c b/src/boot/bless-boot.c index 8e6c146e69..f86d102f0b 100644 --- a/src/boot/bless-boot.c +++ b/src/boot/bless-boot.c @@ -469,7 +469,7 @@ static int verb_set(int argc, char *argv[], void *userdata) { /* First, fsync() the directory these files are located in */ r = fsync_parent_at(fd, skip_leading_slash(target)); if (r < 0) - log_debug_errno(errno, "Failed to synchronize image directory, ignoring: %m"); + log_debug_errno(r, "Failed to synchronize image directory, ignoring: %m"); /* Secondly, syncfs() the whole file system these files are located in */ if (syncfs(fd) < 0) From ac10f7e28c03c05451547e36eeb9b5c19df0ed34 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 7 May 2024 13:18:10 +0200 Subject: [PATCH 03/18] main: pass the right error variable --- src/core/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/main.c b/src/core/main.c index f3a40f65bb..db81b2f07e 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -2637,7 +2637,7 @@ static void setenv_manager_environment(void) { r = putenv_dup(*p, true); if (r < 0) - log_warning_errno(errno, "Failed to setenv \"%s\", ignoring: %m", *p); + log_warning_errno(r, "Failed to setenv \"%s\", ignoring: %m", *p); } } From 6400084caa758677444354eae552ef5415ba4675 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 7 May 2024 13:19:42 +0200 Subject: [PATCH 04/18] exec-invoke: pass the right error variable --- src/core/exec-invoke.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/exec-invoke.c b/src/core/exec-invoke.c index 2ecc9dd856..86bd797896 100644 --- a/src/core/exec-invoke.c +++ b/src/core/exec-invoke.c @@ -2896,7 +2896,7 @@ static int setup_ephemeral( */ r = chattr_fd(fd, FS_NOCOW_FL, FS_NOCOW_FL, NULL); if (r < 0) - log_debug_errno(fd, "Failed to disable copy-on-write for %s, ignoring: %m", new_root); + log_debug_errno(r, "Failed to disable copy-on-write for %s, ignoring: %m", new_root); } else { assert(*root_directory); From be6aa742a6c522c4102a02fcd79231ff5bc5fa9f Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 7 May 2024 13:23:01 +0200 Subject: [PATCH 05/18] resolved-dns-stream: pass the right error variable --- src/resolve/resolved-dns-stream.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/resolve/resolved-dns-stream.c b/src/resolve/resolved-dns-stream.c index 056ba7794f..1a43d0bd49 100644 --- a/src/resolve/resolved-dns-stream.c +++ b/src/resolve/resolved-dns-stream.c @@ -195,7 +195,7 @@ static int dns_stream_identify(DnsStream *s) { /* Make sure all packets for this connection are sent on the same interface */ r = socket_set_unicast_if(s->fd, s->local.sa.sa_family, s->ifindex); if (r < 0) - log_debug_errno(errno, "Failed to invoke IP_UNICAST_IF/IPV6_UNICAST_IF: %m"); + log_debug_errno(r, "Failed to invoke IP_UNICAST_IF/IPV6_UNICAST_IF: %m"); } s->identified = true; @@ -454,7 +454,7 @@ static int on_stream_io(sd_event_source *es, int fd, uint32_t revents, void *use if (progressed && s->timeout_event_source) { r = sd_event_source_set_time_relative(s->timeout_event_source, DNS_STREAM_ESTABLISHED_TIMEOUT_USEC); if (r < 0) - log_warning_errno(errno, "Couldn't restart TCP connection timeout, ignoring: %m"); + log_warning_errno(r, "Couldn't restart TCP connection timeout, ignoring: %m"); } return 0; From af1690cfccceb7e7553f6f842a201be4ebcbbd27 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 7 May 2024 13:29:30 +0200 Subject: [PATCH 06/18] manager: pass the right error variable --- src/core/manager.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/core/manager.c b/src/core/manager.c index 07d5d8cfaa..4c9ef44a4a 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -1242,13 +1242,13 @@ static int manager_setup_user_lookup_fd(Manager *m) { if (!m->user_lookup_event_source) { r = sd_event_add_io(m->event, &m->user_lookup_event_source, m->user_lookup_fds[0], EPOLLIN, manager_dispatch_user_lookup_fd, m); if (r < 0) - return log_error_errno(errno, "Failed to allocate user lookup event source: %m"); + return log_error_errno(r, "Failed to allocate user lookup event source: %m"); /* Process even earlier than the notify event source, so that we always know first about valid UID/GID * resolutions */ r = sd_event_source_set_priority(m->user_lookup_event_source, EVENT_PRIORITY_USER_LOOKUP); if (r < 0) - return log_error_errno(errno, "Failed to set priority of user lookup event source: %m"); + return log_error_errno(r, "Failed to set priority of user lookup event source: %m"); (void) sd_event_source_set_description(m->user_lookup_event_source, "user-lookup"); } @@ -1287,11 +1287,11 @@ static int manager_setup_handoff_timestamp_fd(Manager *m) { if (!m->handoff_timestamp_event_source) { r = sd_event_add_io(m->event, &m->handoff_timestamp_event_source, m->handoff_timestamp_fds[0], EPOLLIN, manager_dispatch_handoff_timestamp_fd, m); if (r < 0) - return log_error_errno(errno, "Failed to allocate handoff timestamp event source: %m"); + return log_error_errno(r, "Failed to allocate handoff timestamp event source: %m"); r = sd_event_source_set_priority(m->handoff_timestamp_event_source, EVENT_PRIORITY_HANDOFF_TIMESTAMP); if (r < 0) - return log_error_errno(errno, "Failed to set priority of handoff timestamp event source: %m"); + return log_error_errno(r, "Failed to set priority of handoff timestamp event source: %m"); (void) sd_event_source_set_description(m->handoff_timestamp_event_source, "handoff-timestamp"); } @@ -3069,7 +3069,7 @@ static int manager_dispatch_signal_fd(sd_event_source *source, int fd, uint32_t r = manager_get_dump_string(m, /* patterns= */ NULL, &dump); if (r < 0) { - log_warning_errno(errno, "Failed to acquire manager dump: %m"); + log_warning_errno(r, "Failed to acquire manager dump: %m"); break; } @@ -3160,7 +3160,7 @@ static int manager_dispatch_signal_fd(sd_event_source *source, int fd, uint32_t r = manager_get_dump_jobs_string(m, /* patterns= */ NULL, " ", &dump_jobs); if (r < 0) { - log_warning_errno(errno, "Failed to acquire manager jobs dump: %m"); + log_warning_errno(r, "Failed to acquire manager jobs dump: %m"); break; } From 422aa53123bfa9b3cf1fb617ed7bdb76d00fe0f4 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 7 May 2024 13:30:37 +0200 Subject: [PATCH 07/18] cgroup-show: pass the right error variable --- src/shared/cgroup-show.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/cgroup-show.c b/src/shared/cgroup-show.c index c7af10687d..ef4f3b3b52 100644 --- a/src/shared/cgroup-show.c +++ b/src/shared/cgroup-show.c @@ -152,7 +152,7 @@ static int show_cgroup_name( if (FLAGS_SET(flags, OUTPUT_CGROUP_ID)) { r = cg_fd_get_cgroupid(fd, &cgroupid); if (r < 0) - log_debug_errno(errno, "Failed to determine cgroup ID of %s, ignoring: %m", path); + log_debug_errno(r, "Failed to determine cgroup ID of %s, ignoring: %m", path); } r = path_extract_filename(path, &b); From 3613a1d49f7847bd20906cc3b45e959b54f91366 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 7 May 2024 13:35:55 +0200 Subject: [PATCH 08/18] userns-restrict: pass the right error variable --- src/nsresourced/userns-restrict.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/nsresourced/userns-restrict.c b/src/nsresourced/userns-restrict.c index 4e917fd758..241a655e62 100644 --- a/src/nsresourced/userns-restrict.c +++ b/src/nsresourced/userns-restrict.c @@ -218,7 +218,7 @@ int userns_restrict_put_by_inode( r = sym_bpf_map_update_elem(outer_map_fd, &ino, &inner_map_fd, BPF_ANY); if (r < 0) - return log_debug_errno(errno, "Failed to replace map in inode hash: %m"); + return log_debug_errno(r, "Failed to replace map in inode hash: %m"); } else { /* Let's add an entry for this userns inode if missing. If it exists just extend the existing map. We * might race against each other, hence we try a couple of times */ @@ -258,7 +258,7 @@ int userns_restrict_put_by_inode( r = sym_bpf_map_update_elem(inner_map_fd, mntid, &dummy_value, BPF_ANY); if (r < 0) - return log_debug_errno(errno, "Failed to add mount ID to map: %m"); + return log_debug_errno(r, "Failed to add mount ID to map: %m"); log_debug("Allowing mount %i on userns inode %" PRIu64, *mntid, ino); } @@ -318,7 +318,7 @@ int userns_restrict_reset_by_inode( r = sym_bpf_map_delete_elem(outer_map_fd, &u); if (r < 0) - return log_debug_errno(outer_map_fd, "Failed to remove entry for inode %" PRIu64 " from outer map: %m", ino); + return log_debug_errno(r, "Failed to remove entry for inode %" PRIu64 " from outer map: %m", ino); return 0; } From 192a452d1ca04cd32153d104e9e3b3c3a6957106 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 7 May 2024 13:40:53 +0200 Subject: [PATCH 09/18] nspawn: pass the right error variable --- src/nspawn/nspawn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index 029a7f9d88..5842d3ba8f 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -2668,7 +2668,7 @@ static int setup_journal(const char *directory) { r = mount_nofollow_verbose(LOG_DEBUG, p, q, NULL, MS_BIND, NULL); if (r < 0) - return log_error_errno(errno, "Failed to bind mount journal from host into guest: %m"); + return log_error_errno(r, "Failed to bind mount journal from host into guest: %m"); return 0; } From 1174ebb45fdc96c4d58676b62b734ebfcc5299d3 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 7 May 2024 13:41:30 +0200 Subject: [PATCH 10/18] test-socket-bind: pass the right error variable --- src/test/test-socket-bind.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test-socket-bind.c b/src/test/test-socket-bind.c index fb65573e7a..13ffa92cf1 100644 --- a/src/test/test-socket-bind.c +++ b/src/test/test-socket-bind.c @@ -83,7 +83,7 @@ static int test_socket_bind( while (!IN_SET(SERVICE(u)->state, SERVICE_DEAD, SERVICE_FAILED)) { r = sd_event_run(m->event, UINT64_MAX); if (r < 0) - return log_error_errno(errno, "Event run failed %m"); + return log_error_errno(r, "Event run failed %m"); } cld_code = SERVICE(u)->exec_command[SERVICE_EXEC_START]->exec_status.code; From 2dd1676fa7913c6ea45ccc6d01c001e61c37c1b4 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 7 May 2024 13:42:29 +0200 Subject: [PATCH 11/18] test-bpf-restrict-fs: pass the right error variable --- src/test/test-bpf-restrict-fs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test-bpf-restrict-fs.c b/src/test/test-bpf-restrict-fs.c index f42ca4edb9..7ece33750b 100644 --- a/src/test/test-bpf-restrict-fs.c +++ b/src/test/test-bpf-restrict-fs.c @@ -46,7 +46,7 @@ static int test_restrict_filesystems(Manager *m, const char *unit_name, const ch while (!IN_SET(SERVICE(u)->state, SERVICE_DEAD, SERVICE_FAILED)) { r = sd_event_run(m->event, UINT64_MAX); if (r < 0) - return log_error_errno(errno, "Event run failed %m"); + return log_error_errno(r, "Event run failed %m"); } cld_code = SERVICE(u)->exec_command[SERVICE_EXEC_START]->exec_status.code; From 3a5046782e74d0405067a79d7aa14456801ce79e Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 7 May 2024 13:43:09 +0200 Subject: [PATCH 12/18] test-bpf-foreign-programs: pass the right error variable --- src/test/test-bpf-foreign-programs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test-bpf-foreign-programs.c b/src/test/test-bpf-foreign-programs.c index cb6073d2a7..34ccb74ccb 100644 --- a/src/test/test-bpf-foreign-programs.c +++ b/src/test/test-bpf-foreign-programs.c @@ -253,7 +253,7 @@ static int test_bpf_cgroup_programs(Manager *m, const char *unit_name, const Tes while (!IN_SET(SERVICE(u)->state, SERVICE_DEAD, SERVICE_FAILED)) { r = sd_event_run(m->event, UINT64_MAX); if (r < 0) - return log_error_errno(errno, "Event run failed %m"); + return log_error_errno(r, "Event run failed %m"); } cld_code = SERVICE(u)->exec_command[SERVICE_EXEC_START]->exec_status.code; From bc65a5e37d66c22296ba10e63a429ce1fbf14acb Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 7 May 2024 13:46:32 +0200 Subject: [PATCH 13/18] homed-manager: pass the right error variable --- src/home/homed-manager.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/home/homed-manager.c b/src/home/homed-manager.c index 8d67f425a5..7669cbb269 100644 --- a/src/home/homed-manager.c +++ b/src/home/homed-manager.c @@ -913,7 +913,7 @@ static int manager_assess_image( r = btrfs_is_subvol_fd(fd); if (r < 0) - return log_warning_errno(errno, "Failed to determine whether %s is a btrfs subvolume: %m", path); + return log_warning_errno(r, "Failed to determine whether %s is a btrfs subvolume: %m", path); if (r > 0) storage = USER_SUBVOLUME; else { @@ -1441,7 +1441,7 @@ static int manager_generate_key_pair(Manager *m) { /* Write out public key (note that we only do that as a help to the user, we don't make use of this ever */ r = fopen_temporary("/var/lib/systemd/home/local.public", &fpublic, &temp_public); if (r < 0) - return log_error_errno(errno, "Failed to open key file for writing: %m"); + return log_error_errno(r, "Failed to open key file for writing: %m"); if (PEM_write_PUBKEY(fpublic, m->private_key) <= 0) return log_error_errno(SYNTHETIC_ERRNO(EIO), "Failed to write public key."); @@ -1455,7 +1455,7 @@ static int manager_generate_key_pair(Manager *m) { /* Write out the private key (this actually writes out both private and public, OpenSSL is confusing) */ r = fopen_temporary("/var/lib/systemd/home/local.private", &fprivate, &temp_private); if (r < 0) - return log_error_errno(errno, "Failed to open key file for writing: %m"); + return log_error_errno(r, "Failed to open key file for writing: %m"); if (PEM_write_PrivateKey(fprivate, m->private_key, NULL, NULL, 0, NULL, 0) <= 0) return log_error_errno(SYNTHETIC_ERRNO(EIO), "Failed to write private key pair."); From 11bbc1f8b8e367019f1e1e1fece3c1cade6cb1c3 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 7 May 2024 13:49:31 +0200 Subject: [PATCH 14/18] homework-fscrypt: pass the right error variable --- src/home/homework-fscrypt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/home/homework-fscrypt.c b/src/home/homework-fscrypt.c index 781fe01f9c..46a7756873 100644 --- a/src/home/homework-fscrypt.c +++ b/src/home/homework-fscrypt.c @@ -212,7 +212,7 @@ static int fscrypt_setup( r = flistxattr_malloc(setup->root_fd, &xattr_buf); if (r < 0) - return log_error_errno(errno, "Failed to retrieve xattr list: %m"); + return log_error_errno(r, "Failed to retrieve xattr list: %m"); NULSTR_FOREACH(xa, xattr_buf) { _cleanup_free_ void *salt = NULL, *encrypted = NULL; @@ -635,7 +635,7 @@ int home_passwd_fscrypt( r = flistxattr_malloc(setup->root_fd, &xattr_buf); if (r < 0) - return log_error_errno(errno, "Failed to retrieve xattr list: %m"); + return log_error_errno(r, "Failed to retrieve xattr list: %m"); NULSTR_FOREACH(xa, xattr_buf) { const char *nr; From 6c936c156ab50907dfed4c13e5a2f54e8df37514 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 7 May 2024 13:50:55 +0200 Subject: [PATCH 15/18] homework-blob: pass the right error variable --- src/home/homework-blob.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/home/homework-blob.c b/src/home/homework-blob.c index 17cb7d6ce3..6b22ab6f24 100644 --- a/src/home/homework-blob.c +++ b/src/home/homework-blob.c @@ -264,7 +264,7 @@ int home_apply_new_blob_dir(UserRecord *h, Hashmap *blobs) { * of the directory. */ r = rm_rf_at(base_dfd, h->user_name, REMOVE_PHYSICAL|REMOVE_MISSING_OK); if (r < 0) - return log_error_errno(errno, "Failed to empty out system blob dir: %m"); + return log_error_errno(r, "Failed to empty out system blob dir: %m"); return 0; } From 2c30973f0bb538a7ed2d19e8c019fcb7deb882a3 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 7 May 2024 13:54:21 +0200 Subject: [PATCH 16/18] homework-quota: pass the right error variable --- src/home/homework-quota.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/home/homework-quota.c b/src/home/homework-quota.c index 7400937e95..c9516829d8 100644 --- a/src/home/homework-quota.c +++ b/src/home/homework-quota.c @@ -107,7 +107,7 @@ int home_update_quota_auto(UserRecord *h, const char *path) { r = btrfs_is_subvol(path); if (r < 0) - return log_error_errno(errno, "Failed to test if %s is a subvolume: %m", path); + return log_error_errno(r, "Failed to test if %s is a subvolume: %m", path); if (r == 0) return log_error_errno(SYNTHETIC_ERRNO(ENOTTY), "Directory %s is not a subvolume, cannot apply quota.", path); From 75c64e58d18eb3726386cde4838546b6a2de525b Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 7 May 2024 13:55:02 +0200 Subject: [PATCH 17/18] udev-rules: pass the right error variable --- src/udev/udev-rules.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c index 51732080e8..581bbaf345 100644 --- a/src/udev/udev-rules.c +++ b/src/udev/udev-rules.c @@ -1536,7 +1536,7 @@ int udev_rules_parse_file(UdevRules *rules, const char *filename, bool extra_che r = hashmap_put_stats_by_path(&rules->stats_by_path, filename, &st); if (r < 0) - return log_warning_errno(errno, "Failed to save stat for %s, ignoring: %m", filename); + return log_warning_errno(r, "Failed to save stat for %s, ignoring: %m", filename); (void) fd_warn_permissions(filename, fileno(f)); From cd35c15de3373fa4415ef013676cde13d9fe7d92 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 7 May 2024 13:56:26 +0200 Subject: [PATCH 18/18] clean-ipc: pass the right error variable --- src/shared/clean-ipc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/clean-ipc.c b/src/shared/clean-ipc.c index bbb343f3d3..1e90cc2a1c 100644 --- a/src/shared/clean-ipc.c +++ b/src/shared/clean-ipc.c @@ -58,7 +58,7 @@ static int clean_sysvipc_shm(uid_t delete_uid, gid_t delete_gid, bool rm) { r = read_line(f, LONG_LINE_MAX, &line); if (r < 0) - return log_warning_errno(errno, "Failed to read /proc/sysvipc/shm: %m"); + return log_warning_errno(r, "Failed to read /proc/sysvipc/shm: %m"); if (r == 0) break;