2022-12-23 02:58:10

by Yang Yang

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

From: Xu Panda <[email protected]>

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 <[email protected]>
Signed-off-by: Yang Yang <[email protected]>
---
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

2023-01-17 23:32:21

by Johannes Berg

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

On Fri, 2022-12-23 at 10:56 +0800, [email protected] wrote:
> From: Xu Panda <[email protected]>
>
> 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 <[email protected]>
> Signed-off-by: Yang Yang <[email protected]>
> ---
> 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

2023-01-18 02:32:59

by Yang Yang

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

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