2022-12-23 03:57:27

by Yang Yang

[permalink] [raw]
Subject: [PATCH linux-next] power: supply: test-power: 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/power/supply/test_power.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/power/supply/test_power.c b/drivers/power/supply/test_power.c
index 5f510ddc946d..0d0a77584c5d 100644
--- a/drivers/power/supply/test_power.c
+++ b/drivers/power/supply/test_power.c
@@ -306,8 +306,7 @@ static int map_get_value(struct battery_property_map *map, const char *key,
char buf[MAX_KEYLENGTH];
int cr;

- strncpy(buf, key, MAX_KEYLENGTH);
- buf[MAX_KEYLENGTH-1] = '\0';
+ strscpy(buf, key, MAX_KEYLENGTH);

cr = strnlen(buf, MAX_KEYLENGTH) - 1;
if (cr < 0)
--
2.15.2


2023-02-03 12:46:29

by Sebastian Reichel

[permalink] [raw]
Subject: Re: [PATCH linux-next] power: supply: test-power: use strscpy() to instead of? strncpy()

Hi,

On Fri, Dec 23, 2022 at 10:42:35AM +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]>
> ---

Thanks, queued.

-- Sebastian

> drivers/power/supply/test_power.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/power/supply/test_power.c b/drivers/power/supply/test_power.c
> index 5f510ddc946d..0d0a77584c5d 100644
> --- a/drivers/power/supply/test_power.c
> +++ b/drivers/power/supply/test_power.c
> @@ -306,8 +306,7 @@ static int map_get_value(struct battery_property_map *map, const char *key,
> char buf[MAX_KEYLENGTH];
> int cr;
>
> - strncpy(buf, key, MAX_KEYLENGTH);
> - buf[MAX_KEYLENGTH-1] = '\0';
> + strscpy(buf, key, MAX_KEYLENGTH);
>
> cr = strnlen(buf, MAX_KEYLENGTH) - 1;
> if (cr < 0)
> --
> 2.15.2

Attachments:
(No filename) (0.99 kB)
 signature.asc (833.00 B)
 Download all attachments