]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
ath10k: replace strlcpy with strscpy
authorJason Wang <wangborong@cdjrlc.com>
Tue, 21 Dec 2021 10:04:20 +0000 (12:04 +0200)
committerKalle Valo <quic_kvalo@quicinc.com>
Wed, 22 Dec 2021 06:02:08 +0000 (08:02 +0200)
The strlcpy should not be used because it doesn't limit the source
length. So that it will lead some potential bugs.

But the strscpy doesn't require reading memory from the src string
beyond the specified "count" bytes, and since the return value is
easier to error-check than strlcpy()'s. In addition, the implementation
is robust to the string changing out from underneath it, unlike the
current strlcpy() implementation.

Thus, replace strlcpy with strscpy.

Signed-off-by: Jason Wang <wangborong@cdjrlc.com>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20211221070931.725720-1-wangborong@cdjrlc.com
drivers/net/wireless/ath/ath10k/coredump.c

index 55e7e11d06d9481f1806b626da84a26faf9ae8a2..fe6b6f97a91631005acad93b6dc195003e508e54 100644 (file)
@@ -1522,7 +1522,7 @@ static struct ath10k_dump_file_data *ath10k_coredump_build(struct ath10k *ar)
        mutex_lock(&ar->dump_mutex);
 
        dump_data = (struct ath10k_dump_file_data *)(buf);
-       strlcpy(dump_data->df_magic, "ATH10K-FW-DUMP",
+       strscpy(dump_data->df_magic, "ATH10K-FW-DUMP",
                sizeof(dump_data->df_magic));
        dump_data->len = cpu_to_le32(len);
 
@@ -1543,11 +1543,11 @@ static struct ath10k_dump_file_data *ath10k_coredump_build(struct ath10k *ar)
        dump_data->vht_cap_info = cpu_to_le32(ar->vht_cap_info);
        dump_data->num_rf_chains = cpu_to_le32(ar->num_rf_chains);
 
-       strlcpy(dump_data->fw_ver, ar->hw->wiphy->fw_version,
+       strscpy(dump_data->fw_ver, ar->hw->wiphy->fw_version,
                sizeof(dump_data->fw_ver));
 
        dump_data->kernel_ver_code = 0;
-       strlcpy(dump_data->kernel_ver, init_utsname()->release,
+       strscpy(dump_data->kernel_ver, init_utsname()->release,
                sizeof(dump_data->kernel_ver));
 
        dump_data->tv_sec = cpu_to_le64(crash_data->timestamp.tv_sec);