* [PATCH net-next] wifi: airo: use strscpy() to instead of strncpy()
@ 2022-12-23 2:52 yang.yang29
2023-01-17 21:27 ` Johannes Berg
0 siblings, 1 reply; 3+ messages in thread
From: yang.yang29 @ 2022-12-23 2:52 UTC (permalink / raw)
To: kvalo
Cc: davem, edumazet, kuba, pabeni, akpm, songmuchun, brauner,
julia.lawall, gustavoars, jason, linux-wireless, netdev,
linux-kernel, xu.panda, yang.yang29
From: Xu Panda <xu.panda@zte.com.cn>
The implementation of strscpy() is more robust and safer.
That's now the recommended way to copy NUL-terminated strings.
Signed-off-by: Xu Panda <xu.panda@zte.com.cn>
Signed-off-by: Yang Yang <yang.yang29@zte.com>
---
drivers/net/wireless/cisco/airo.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/wireless/cisco/airo.c b/drivers/net/wireless/cisco/airo.c
index 7c4cc5f5e1eb..600a64f671ce 100644
--- a/drivers/net/wireless/cisco/airo.c
+++ b/drivers/net/wireless/cisco/airo.c
@@ -6067,8 +6067,7 @@ static int airo_get_nick(struct net_device *dev,
struct airo_info *local = dev->ml_priv;
readConfigRid(local, 1);
- strncpy(extra, local->config.nodeName, 16);
- extra[16] = '\0';
+ strscpy(extra, local->config.nodeName, 17);
dwrq->length = strlen(extra);
return 0;
--
2.15.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net-next] wifi: airo: use strscpy() to instead of strncpy()
2022-12-23 2:52 [PATCH net-next] wifi: airo: use strscpy() to instead of strncpy() yang.yang29
@ 2023-01-17 21:27 ` Johannes Berg
2023-01-18 2:22 ` yang.yang29
0 siblings, 1 reply; 3+ messages in thread
From: Johannes Berg @ 2023-01-17 21:27 UTC (permalink / raw)
To: yang.yang29, kvalo
Cc: davem, edumazet, kuba, pabeni, akpm, songmuchun, brauner,
julia.lawall, gustavoars, jason, linux-wireless, netdev,
linux-kernel, xu.panda
On Fri, 2022-12-23 at 10:52 +0800, yang.yang29@zte.com.cn wrote:
> From: Xu Panda <xu.panda@zte.com.cn>
>
> The implementation of strscpy() is more robust and safer.
> That's now the recommended way to copy NUL-terminated strings.
>
> Signed-off-by: Xu Panda <xu.panda@zte.com.cn>
> Signed-off-by: Yang Yang <yang.yang29@zte.com>
> ---
> drivers/net/wireless/cisco/airo.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/cisco/airo.c b/drivers/net/wireless/cisco/airo.c
> index 7c4cc5f5e1eb..600a64f671ce 100644
> --- a/drivers/net/wireless/cisco/airo.c
> +++ b/drivers/net/wireless/cisco/airo.c
> @@ -6067,8 +6067,7 @@ static int airo_get_nick(struct net_device *dev,
> struct airo_info *local = dev->ml_priv;
>
> readConfigRid(local, 1);
> - strncpy(extra, local->config.nodeName, 16);
> - extra[16] = '\0';
> + strscpy(extra, local->config.nodeName, 17);
> dwrq->length = strlen(extra);
>
Again, why bother. But is this even correct/identical behaviour?
Wouldn't it potentially read 17 input bytes before forcing NUL-
termination?
johannes
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-next] wifi: airo: use strscpy() to instead of strncpy()
2023-01-17 21:27 ` Johannes Berg
@ 2023-01-18 2:22 ` yang.yang29
0 siblings, 0 replies; 3+ messages in thread
From: yang.yang29 @ 2023-01-18 2:22 UTC (permalink / raw)
To: johannes
Cc: kvalo, davem, edumazet, kuba, pabeni, akpm, songmuchun, brauner,
julia.lawall, gustavoars, jason, linux-wireless, netdev,
linux-kernel, xu.panda
> Again, why bother. But is this even correct/identical behaviour?>>
> Wouldn't it potentially read 17 input bytes before forcing NUL-
> termination?
Thank you for your reminder. This is a terrible error. Strscpy() may
cause the array to be out of bounds. I should be more cautious
next time.
Xu and Yang
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-01-18 2:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-23 2:52 [PATCH net-next] wifi: airo: use strscpy() to instead of strncpy() yang.yang29
2023-01-17 21:27 ` Johannes Berg
2023-01-18 2:22 ` yang.yang29
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox