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

Bugprone argument comment 7 (#37556)

Browse Source 
Follow up from https://github.com/systemd/systemd/pull/37507
This commit is contained in:
Yu Watanabe
2025-05-25 01:53:13 +09:00
committed by GitHub
parent 69a283c5f2 637f623920
commit 9b6bb9a43c
17 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/cgroup-util.c
+12 -12
View File
@@ -292,7 +292,7 @@ int cg_kill(
const char *path,
int sig,
CGroupFlags flags,
Set *s,
Set *killed_pids,
cg_kill_log_func_t log_kill,
void *userdata) {
@@ -312,9 +312,9 @@ int cg_kill(
*
* When sending SIGKILL, prefer cg_kill_kernel_sigkill(), which is fully atomic. */
if (!s) {
s = allocated_set = set_new(NULL);
if (!s)
if (!killed_pids) {
killed_pids = allocated_set = set_new(NULL);
if (!killed_pids)
return -ENOMEM;
}
@@ -343,7 +343,7 @@ int cg_kill(
if ((flags & CGROUP_IGNORE_SELF) && pidref_is_self(&pidref))
continue;
if (set_contains(s, PID_TO_PTR(pidref.pid)))
if (set_contains(killed_pids, PID_TO_PTR(pidref.pid)))
continue;
/* Ignore kernel threads to mimic the behavior of cgroup.kill. */
@@ -373,7 +373,7 @@ int cg_kill(
done = false;
r = set_put(s, PID_TO_PTR(pidref.pid));
r = set_put(killed_pids, PID_TO_PTR(pidref.pid));
if (r < 0)
return RET_GATHER(ret, r);
}
@@ -390,7 +390,7 @@ int cg_kill_recursive(
const char *path,
int sig,
CGroupFlags flags,
Set *s,
Set *killed_pids,
cg_kill_log_func_t log_kill,
void *userdata) {
@@ -401,13 +401,13 @@ int cg_kill_recursive(
assert(path);
assert(sig >= 0);
if (!s) {
s = allocated_set = set_new(NULL);
if (!s)
if (!killed_pids) {
killed_pids = allocated_set = set_new(NULL);
if (!killed_pids)
return -ENOMEM;
}
ret = cg_kill(path, sig, flags, s, log_kill, userdata);
ret = cg_kill(path, sig, flags, killed_pids, log_kill, userdata);
r = cg_enumerate_subgroups(SYSTEMD_CGROUP_CONTROLLER, path, &d);
if (r < 0) {
@@ -432,7 +432,7 @@ int cg_kill_recursive(
if (!p)
return -ENOMEM;
r = cg_kill_recursive(p, sig, flags, s, log_kill, userdata);
r = cg_kill_recursive(p, sig, flags, killed_pids, log_kill, userdata);
if (r < 0)
log_debug_errno(r, "Failed to recursively kill processes in cgroup '%s': %m", p);
if (r != 0 && ret >= 0)
src/basic/cgroup-util.h
+2 -2
View File
@@ -206,9 +206,9 @@ int cg_read_subgroup(DIR *d, char **ret);
typedef int (*cg_kill_log_func_t)(const PidRef *pid, int sig, void *userdata);
int cg_kill(const char *path, int sig, CGroupFlags flags, Set *s, cg_kill_log_func_t kill_log, void *userdata);
int cg_kill(const char *path, int sig, CGroupFlags flags, Set *killed_pids, cg_kill_log_func_t log_kill, void *userdata);
int cg_kill_kernel_sigkill(const char *path);
int cg_kill_recursive(const char *path, int sig, CGroupFlags flags, Set *s, cg_kill_log_func_t kill_log, void *userdata);
int cg_kill_recursive(const char *path, int sig, CGroupFlags flags, Set *killed_pids, cg_kill_log_func_t log_kill, void *userdata);
int cg_split_spec(const char *spec, char **ret_controller, char **ret_path);
int cg_mangle_path(const char *path, char **ret);
src/core/unit.c
+2 -2
View File
@@ -4928,7 +4928,7 @@ int unit_kill_context(Unit *u, KillOperation k) {
SIGHUP,
CGROUP_IGNORE_SELF,
pid_set,
/* kill_log= */ NULL,
/* log_kill= */ NULL,
/* userdata= */ NULL);
}
}
@@ -6008,7 +6008,7 @@ int unit_warn_leftover_processes(Unit *u, bool start) {
crt->cgroup_path,
/* sig= */ 0,
/* flags= */ 0,
/* set= */ NULL,
/* killed_pids= */ NULL,
start ? unit_log_leftover_process_start : unit_log_leftover_process_stop,
u);
}
src/cryptenroll/cryptenroll-fido2.c
+2 -2
View File
@@ -118,8 +118,8 @@ int enroll_fido2(
/* user_id= */ un, strlen(un), /* We pass the user ID and name as the same: the disk's UUID if we have it */
/* user_name= */ un,
/* user_display_name= */ node,
/* user_icon_name= */ NULL,
/* askpw_icon_name= */ "drive-harddisk",
/* user_icon= */ NULL,
/* askpw_icon= */ "drive-harddisk",
/* askpw_credential= */ "cryptenroll.fido2-pin",
lock_with,
cred_alg,
src/fuzz/fuzz-varlink-idl.c
+1 -1
View File
@@ -19,7 +19,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
assert_se(str = memdup_suffix0(data, size));
r = sd_varlink_idl_parse(str, /* ret_line= */ NULL, /* column= */ NULL, &vi);
r = sd_varlink_idl_parse(str, /* reterr_line= */ NULL, /* reterr_column= */ NULL, &vi);
if (r < 0) {
log_debug_errno(r, "Failed to parse varlink interface definition: %m");
return 0;
src/home/homectl-fido2.c
+2 -2
View File
@@ -171,8 +171,8 @@ int identity_add_fido2_parameters(
/* user_id= */ fido_un, strlen(fido_un), /* We pass the user ID and name as the same */
/* user_name= */ fido_un,
/* user_display_name= */ rn ? sd_json_variant_string(rn) : NULL,
/* user_icon_name= */ NULL,
/* askpw_icon_name= */ "user-home",
/* user_icon= */ NULL,
/* askpw_icon= */ "user-home",
/* askpw_credential= */ "home.token-pin",
lock_with,
cred_alg,
src/import/importctl.c
+3 -3
View File
@@ -195,7 +195,7 @@ static int transfer_image_common(sd_bus *bus, sd_bus_message *m) {
bus_import_mgr,
"TransferRemoved",
match_transfer_removed,
/* add_callback= */ NULL,
/* install_callback= */ NULL,
&c);
if (r < 0)
return log_error_errno(r, "Failed to request match: %m");
@@ -208,7 +208,7 @@ static int transfer_image_common(sd_bus *bus, sd_bus_message *m) {
"org.freedesktop.import1.Transfer",
"LogMessage",
match_log_message,
/* add_callback= */ NULL,
/* install_callback= */ NULL,
&c);
if (r < 0)
return log_error_errno(r, "Failed to request match: %m");
@@ -221,7 +221,7 @@ static int transfer_image_common(sd_bus *bus, sd_bus_message *m) {
"org.freedesktop.import1.Transfer",
"ProgressUpdate",
match_progress_update,
/* add_callback= */ NULL,
/* install_callback= */ NULL,
&c);
if (r < 0)
return log_error_errno(r, "Failed to request match: %m");
src/libsystemd/sd-bus/bus-message.c
+21 -21
View File
@@ -3180,7 +3180,7 @@ static void message_quit_container(sd_bus_message *m) {
c->index = c->saved_index;
}
_public_ int sd_bus_message_peek_type(sd_bus_message *m, char *type, const char **contents) {
_public_ int sd_bus_message_peek_type(sd_bus_message *m, char *ret_type, const char **ret_contents) {
struct bus_container *c;
int r;
@@ -3196,16 +3196,16 @@ _public_ int sd_bus_message_peek_type(sd_bus_message *m, char *type, const char
c = message_get_last_container(m);
if (bus_type_is_basic(c->signature[c->index])) {
if (contents)
*contents = NULL;
if (type)
*type = c->signature[c->index];
if (ret_contents)
*ret_contents = NULL;
if (ret_type)
*ret_type = c->signature[c->index];
return 1;
}
if (c->signature[c->index] == SD_BUS_TYPE_ARRAY) {
if (contents) {
if (ret_contents) {
size_t l;
r = signature_element_length(c->signature+c->index+1, &l);
@@ -3220,18 +3220,18 @@ _public_ int sd_bus_message_peek_type(sd_bus_message *m, char *type, const char
c->signature + c->index + 1, l) < 0)
return -ENOMEM;
*contents = c->peeked_signature;
*ret_contents = c->peeked_signature;
}
if (type)
*type = SD_BUS_TYPE_ARRAY;
if (ret_type)
*ret_type = SD_BUS_TYPE_ARRAY;
return 1;
}
if (IN_SET(c->signature[c->index], SD_BUS_TYPE_STRUCT_BEGIN, SD_BUS_TYPE_DICT_ENTRY_BEGIN)) {
if (contents) {
if (ret_contents) {
size_t l;
r = signature_element_length(c->signature+c->index, &l);
@@ -3243,17 +3243,17 @@ _public_ int sd_bus_message_peek_type(sd_bus_message *m, char *type, const char
c->signature + c->index + 1, l - 2) < 0)
return -ENOMEM;
*contents = c->peeked_signature;
*ret_contents = c->peeked_signature;
}
if (type)
*type = c->signature[c->index] == SD_BUS_TYPE_STRUCT_BEGIN ? SD_BUS_TYPE_STRUCT : SD_BUS_TYPE_DICT_ENTRY;
if (ret_type)
*ret_type = c->signature[c->index] == SD_BUS_TYPE_STRUCT_BEGIN ? SD_BUS_TYPE_STRUCT : SD_BUS_TYPE_DICT_ENTRY;
return 1;
}
if (c->signature[c->index] == SD_BUS_TYPE_VARIANT) {
if (contents) {
if (ret_contents) {
size_t rindex, l;
void *q;
@@ -3274,11 +3274,11 @@ _public_ int sd_bus_message_peek_type(sd_bus_message *m, char *type, const char
if (!validate_signature(q, l))
return -EBADMSG;
*contents = q;
*ret_contents = q;
}
if (type)
*type = SD_BUS_TYPE_VARIANT;
if (ret_type)
*ret_type = SD_BUS_TYPE_VARIANT;
return 1;
}
@@ -3286,10 +3286,10 @@ _public_ int sd_bus_message_peek_type(sd_bus_message *m, char *type, const char
return -EINVAL;
eof:
if (type)
*type = 0;
if (contents)
*contents = NULL;
if (ret_type)
*ret_type = 0;
if (ret_contents)
*ret_contents = NULL;
return 0;
}
src/pcrlock/pcrlock.c
+1 -1
View File
@@ -4397,7 +4397,7 @@ static int write_boot_policy_file(const char *json_text) {
/* tpm2_device= */ NULL,
/* tpm2_hash_pcr_mask= */ 0,
/* tpm2_pubkey_path= */ NULL,
/* tpm2_pubkey_path_mask= */ 0,
/* tpm2_pubkey_pcr_mask= */ 0,
UID_INVALID,
&IOVEC_MAKE_STRING(json_text),
CREDENTIAL_ALLOW_NULL,
src/shared/creds-util.c
+1 -1
View File
@@ -972,7 +972,7 @@ int encrypt_credential_and_warn(
r = tpm2_seal(tpm2_context,
/* seal_key_handle= */ 0,
&tpm2_policy,
/* n_policy_hash= */ 1,
/* n_policy= */ 1,
/* pin= */ NULL,
&tpm2_key,
&blobs,
src/shared/dissect-image.h
+1 -1
View File
@@ -172,7 +172,7 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(DissectedImage*, dissected_image_unref);
int dissected_image_decrypt(DissectedImage *m, const char *passphrase, const VeritySettings *verity, DissectImageFlags flags);
int dissected_image_decrypt_interactively(DissectedImage *m, const char *passphrase, const VeritySettings *verity, DissectImageFlags flags);
int dissected_image_mount(DissectedImage *m, const char *dest, uid_t uid_shift, uid_t uid_range, int userns_fd, DissectImageFlags flags);
int dissected_image_mount(DissectedImage *m, const char *where, uid_t uid_shift, uid_t uid_range, int userns_fd, DissectImageFlags flags);
int dissected_image_mount_and_warn(DissectedImage *m, const char *where, uid_t uid_shift, uid_t uid_range, int userns_fd, DissectImageFlags flags);
int dissected_image_acquire_metadata(DissectedImage *m, int userns_fd, DissectImageFlags extra_flags);
src/shared/killall.c
+1 -1
View File
@@ -53,7 +53,7 @@ static bool is_in_survivor_cgroup(const PidRef *pid) {
assert(pidref_is_set(pid));
r = cg_pidref_get_path(/* root= */ NULL, pid, &cgroup_path);
r = cg_pidref_get_path(/* controller= */ NULL, pid, &cgroup_path);
if (r == -EUNATCH) {
log_warning_errno(r, "Process " PID_FMT " appears to originate in foreign namespace, ignoring.", pid->pid);
return true;
src/shared/machine-id-setup.c
+3 -3
View File
@@ -267,7 +267,7 @@ int machine_id_setup(const char *root, sd_id128_t machine_id, MachineIdSetupFlag
unlink_run_machine_id = true;
} else {
r = chase("/run/machine-id", root, CHASE_PREFIX_ROOT|CHASE_MUST_BE_REGULAR, &run_machine_id, /* ret_inode_fd= */ NULL);
r = chase("/run/machine-id", root, CHASE_PREFIX_ROOT|CHASE_MUST_BE_REGULAR, &run_machine_id, /* ret_fd= */ NULL);
if (r < 0)
return log_error_errno(r, "Failed to open '/run/machine-id': %m");
}
@@ -283,7 +283,7 @@ int machine_id_setup(const char *root, sd_id128_t machine_id, MachineIdSetupFlag
log_full(FLAGS_SET(flags, MACHINE_ID_SETUP_FORCE_TRANSIENT) ? LOG_DEBUG : LOG_INFO, "Installed transient '%s' file.", etc_machine_id);
/* Mark the mount read-only (note: we are not going via FORMAT_PROC_FD_PATH() here because that fd is not updated to our new bind mount) */
(void) mount_follow_verbose(LOG_WARNING, /* source= */ NULL, etc_machine_id, /* fstype= */ NULL, MS_BIND|MS_RDONLY|MS_REMOUNT, /* options= */ NULL);
(void) mount_follow_verbose(LOG_WARNING, /* what= */ NULL, etc_machine_id, /* fstype= */ NULL, MS_BIND|MS_RDONLY|MS_REMOUNT, /* options= */ NULL);
finish:
if (!in_initrd())
@@ -394,7 +394,7 @@ int machine_id_commit(const char *root) {
"Failed to switch back to initial mount namespace: %m.\n"
"We'll keep transient %s file until next reboot.", etc_machine_id);
r = umountat_detach_verbose(LOG_DEBUG, fd, /* filename= */ NULL);
r = umountat_detach_verbose(LOG_DEBUG, fd, /* where= */ NULL);
if (r < 0)
return log_warning_errno(r,
"Failed to unmount transient %s file: %m.\n"
src/shared/tpm2-util.h
+1 -1
View File
@@ -271,7 +271,7 @@ int tpm2_calculate_policy_or(const TPM2B_DIGEST *branches, size_t n_branches, TP
int tpm2_calculate_policy_super_pcr(Tpm2PCRPrediction *prediction, uint16_t algorithm, TPM2B_DIGEST *pcr_policy);
int tpm2_calculate_policy_signed(TPM2B_DIGEST *digest, const TPM2B_NAME *name);
int tpm2_calculate_serialize(TPM2_HANDLE handle, const TPM2B_NAME *name, const TPM2B_PUBLIC *public, void **ret_serialized, size_t *ret_serialized_size);
int tpm2_calculate_sealing_policy(const Tpm2PCRValue *pcr_values, size_t n_pcr_values, const TPM2B_PUBLIC *public, bool use_pin, const Tpm2PCRLockPolicy *policy, TPM2B_DIGEST *digest);
int tpm2_calculate_sealing_policy(const Tpm2PCRValue *pcr_values, size_t n_pcr_values, const TPM2B_PUBLIC *public, bool use_pin, const Tpm2PCRLockPolicy *pcrlock_policy, TPM2B_DIGEST *digest);
int tpm2_calculate_seal(TPM2_HANDLE parent_handle, const TPM2B_PUBLIC *parent_public, const TPMA_OBJECT *attributes, const struct iovec *secret, const TPM2B_DIGEST *policy, const char *pin, struct iovec *ret_secret, struct iovec *ret_blob, struct iovec *ret_serialized_parent);
int tpm2_get_srk_template(TPMI_ALG_PUBLIC alg, TPMT_PUBLIC *ret_template);
src/systemd/sd-bus.h
+2 -2
View File
@@ -251,7 +251,7 @@ int sd_bus_message_read_strv_extend(sd_bus_message *m, char ***l);
int sd_bus_message_skip(sd_bus_message *m, const char *types);
int sd_bus_message_enter_container(sd_bus_message *m, char type, const char *contents);
int sd_bus_message_exit_container(sd_bus_message *m);
int sd_bus_message_peek_type(sd_bus_message *m, char *type, const char **contents);
int sd_bus_message_peek_type(sd_bus_message *m, char *ret_type, const char **ret_contents);
int sd_bus_message_verify_type(sd_bus_message *m, char type, const char *contents);
int sd_bus_message_at_end(sd_bus_message *m, int complete);
int sd_bus_message_rewind(sd_bus_message *m, int complete);
@@ -313,7 +313,7 @@ int sd_bus_query_sender_creds(sd_bus_message *m, uint64_t mask, sd_bus_creds **c
int sd_bus_query_sender_privilege(sd_bus_message *m, int capability);
int sd_bus_match_signal(sd_bus *bus, sd_bus_slot **ret, const char *sender, const char *path, const char *interface, const char *member, sd_bus_message_handler_t callback, void *userdata);
int sd_bus_match_signal_async(sd_bus *bus, sd_bus_slot **ret, const char *sender, const char *path, const char *interface, const char *member, sd_bus_message_handler_t match_callback, sd_bus_message_handler_t add_callback, void *userdata);
int sd_bus_match_signal_async(sd_bus *bus, sd_bus_slot **ret, const char *sender, const char *path, const char *interface, const char *member, sd_bus_message_handler_t match_callback, sd_bus_message_handler_t install_callback, void *userdata);
/* Credential handling */
src/udev/udev-manager.c
+1 -1
View File
@@ -1321,7 +1321,7 @@ static int on_post(sd_event_source *s, void *userdata) {
if (manager->cgroup && set_isempty(manager->synthesize_change_child_event_sources))
/* cleanup possible left-over processes in our cgroup */
(void) cg_kill(manager->cgroup, SIGKILL, CGROUP_IGNORE_SELF, /* set=*/ NULL, /* kill_log= */ NULL, /* userdata= */ NULL);
(void) cg_kill(manager->cgroup, SIGKILL, CGROUP_IGNORE_SELF, /* killed_pids=*/ NULL, /* log_kill= */ NULL, /* userdata= */ NULL);
return 0;
}
src/validatefs/validatefs.c
+3 -3
View File
@@ -257,7 +257,7 @@ static int validate_gpt_label(blkid_probe b, const ValidateFields *f) {
return 0;
const char *v = NULL;
(void) blkid_probe_lookup_value(b, "PART_ENTRY_NAME", &v, /* ret_len= */ NULL);
(void) blkid_probe_lookup_value(b, "PART_ENTRY_NAME", &v, /* len= */ NULL);
if (strv_contains(f->gpt_label, strempty(v)))
return 0;
@@ -277,7 +277,7 @@ static int validate_gpt_type(blkid_probe b, const ValidateFields *f) {
return 0;
const char *v = NULL;
(void) blkid_probe_lookup_value(b, "PART_ENTRY_TYPE", &v, /* ret_len= */ NULL);
(void) blkid_probe_lookup_value(b, "PART_ENTRY_TYPE", &v, /* len= */ NULL);
sd_id128_t id;
if (!v || sd_id128_from_string(v, &id) < 0) {
@@ -335,7 +335,7 @@ static int validate_gpt_metadata_one(sd_device *d, const char *path, const Valid
assert(r == _BLKID_SAFEPROBE_FOUND);
const char *v = NULL;
(void) blkid_probe_lookup_value(b, "PART_ENTRY_SCHEME", &v, /* ret_len= */ NULL);
(void) blkid_probe_lookup_value(b, "PART_ENTRY_SCHEME", &v, /* len= */ NULL);
if (!streq_ptr(v, "gpt"))
return log_error_errno(SYNTHETIC_ERRNO(EPERM), "File system is supposed to be on a GPT partition table, but is not, refusing.");