2022-09-16 06:52:30

by CGEL

Subject: [PATCH] carl9170: use strscpy() is more robust and safer

From: Minghao Chi <[email protected]>

The implementation of strscpy() is more robust and safer.

That's now the recommended way to copy NUL terminated strings.

Reported-by: Zeal Robot <[email protected]>
Signed-off-by: Minghao Chi <[email protected]>
---
drivers/net/wireless/ath/carl9170/fw.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/ath/carl9170/fw.c b/drivers/net/wireless/ath/carl9170/fw.c
index 1ab09e1c9ec5..4c1aecd1163c 100644
--- a/drivers/net/wireless/ath/carl9170/fw.c
+++ b/drivers/net/wireless/ath/carl9170/fw.c
@@ -105,7 +105,7 @@ static void carl9170_fw_info(struct ar9170 *ar)
CARL9170FW_GET_MONTH(fw_date),
CARL9170FW_GET_DAY(fw_date));

- strlcpy(ar->hw->wiphy->fw_version, motd_desc->release,
+ strscpy(ar->hw->wiphy->fw_version, motd_desc->release,
sizeof(ar->hw->wiphy->fw_version));
}
}
--
2.25.1

2022-09-16 08:53:58

by Kalle Valo

Subject: Re: [PATCH] carl9170: use strscpy() is more robust and safer

[email protected] writes:

> From: Minghao Chi <[email protected]>
>
> The implementation of strscpy() is more robust and safer.
>
> That's now the recommended way to copy NUL terminated strings.
>
> Reported-by: Zeal Robot <[email protected]>
> Signed-off-by: Minghao Chi <[email protected]>
> ---
> drivers/net/wireless/ath/carl9170/fw.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/ath/carl9170/fw.c b/drivers/net/wireless/ath/carl9170/fw.c
> index 1ab09e1c9ec5..4c1aecd1163c 100644
> --- a/drivers/net/wireless/ath/carl9170/fw.c
> +++ b/drivers/net/wireless/ath/carl9170/fw.c
> @@ -105,7 +105,7 @@ static void carl9170_fw_info(struct ar9170 *ar)
> CARL9170FW_GET_MONTH(fw_date),
> CARL9170FW_GET_DAY(fw_date));
>
> - strlcpy(ar->hw->wiphy->fw_version, motd_desc->release,
> + strscpy(ar->hw->wiphy->fw_version, motd_desc->release,
> sizeof(ar->hw->wiphy->fw_version));

Already changed in:

https://git.kernel.org/netdev/net-next/c/bf99f11df4de

Please use latest trees to avoid duplicate work.

--
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches