linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH net-next] wifi: ipw2200: use strscpy() to instead of strncpy()
@ 2022-12-23  2:56 yang.yang29
  2023-01-17 21:23 ` Johannes Berg
  0 siblings, 1 reply; 3+ messages in thread
From: yang.yang29 @ 2022-12-23  2:56 UTC (permalink / raw)
  To: stas.yakovlev
  Cc: kvalo, davem, edumazet, kuba, pabeni, 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/intel/ipw2x00/ipw2200.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2200.c b/drivers/net/wireless/intel/ipw2x00/ipw2200.c
index ca802af8cddc..6656cea496b1 100644
--- a/drivers/net/wireless/intel/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/intel/ipw2x00/ipw2200.c
@@ -1483,8 +1483,7 @@ static ssize_t scan_age_store(struct device *d, struct device_attribute *attr,

 	IPW_DEBUG_INFO("enter\n");

-	strncpy(buffer, buf, len);
-	buffer[len] = 0;
+	strncpy(buffer, buf, len + 1);

 	if (p[1] == 'x' || p[1] == 'X' || p[0] == 'x' || p[0] == 'X') {
 		p++;
-- 
2.15.2

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH net-next] wifi: ipw2200: use strscpy() to instead of strncpy()
  2022-12-23  2:56 [PATCH net-next] wifi: ipw2200: use strscpy() to instead of strncpy() yang.yang29
@ 2023-01-17 21:23 ` Johannes Berg
  2023-01-18  2:29   ` yang.yang29
  0 siblings, 1 reply; 3+ messages in thread
From: Johannes Berg @ 2023-01-17 21:23 UTC (permalink / raw)
  To: yang.yang29, stas.yakovlev
  Cc: kvalo, davem, edumazet, kuba, pabeni, linux-wireless, netdev,
	linux-kernel, xu.panda

On Fri, 2022-12-23 at 10:56 +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/intel/ipw2x00/ipw2200.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2200.c b/drivers/net/wireless/intel/ipw2x00/ipw2200.c
> index ca802af8cddc..6656cea496b1 100644
> --- a/drivers/net/wireless/intel/ipw2x00/ipw2200.c
> +++ b/drivers/net/wireless/intel/ipw2x00/ipw2200.c
> @@ -1483,8 +1483,7 @@ static ssize_t scan_age_store(struct device *d, struct device_attribute *attr,
> 
>  	IPW_DEBUG_INFO("enter\n");
> 
> -	strncpy(buffer, buf, len);
> -	buffer[len] = 0;
> +	strncpy(buffer, buf, len + 1);
> 

Ummm?

But anyway - why bother ... ancient drivers, clearly OK code.

johannes

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH net-next] wifi: ipw2200: use strscpy() to instead of strncpy()
  2023-01-17 21:23 ` Johannes Berg
@ 2023-01-18  2:29   ` yang.yang29
  0 siblings, 0 replies; 3+ messages in thread
From: yang.yang29 @ 2023-01-18  2:29 UTC (permalink / raw)
  To: johannes
  Cc: stas.yakovlev, kvalo, davem, edumazet, kuba, pabeni,
	linux-wireless, netdev, linux-kernel, xu.panda

> But anyway - why bother ... ancient drivers, clearly OK code.

Thank you, got it, it's useful information. Sorry for to bother and
please ignore this patch.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2023-01-18  2:30 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:56 [PATCH net-next] wifi: ipw2200: use strscpy() to instead of strncpy() yang.yang29
2023-01-17 21:23 ` Johannes Berg
2023-01-18  2:29   ` yang.yang29

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).