wifi: ipw2200: use strscpy() to instead of strncpy()

[PATCH net-next] wifi: ipw2200: use strscpy() to instead of strncpy()

Posted by yang.yang29@zte.com.cn 2 years, 8 months ago

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

Re: [PATCH net-next] wifi: ipw2200: use strscpy() to instead of strncpy()

Posted by Johannes Berg 2 years, 8 months ago

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

Re: [PATCH net-next] wifi: ipw2200: use strscpy() to instead of strncpy()

Posted by yang.yang29@zte.com.cn 2 years, 8 months ago

> 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.