[linux-next,v2] parisc: use strscpy() to instead of strncpy()
Commit Message
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>
---
change for v2
- sizeof(in) is better and simplified, thanks for Helge Deller.
---
drivers/parisc/pdc_stable.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
Comments
Am Montag, 26. Dezember 2022, 11:40:04 CET schrieb yang.yang29@zte.com.cn:
> 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>
> ---
> change for v2
> - sizeof(in) is better and simplified, thanks for Helge Deller.
> ---
> drivers/parisc/pdc_stable.c | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/parisc/pdc_stable.c b/drivers/parisc/pdc_stable.c
> index d6af5726ddf3..d3075445260b 100644
> --- a/drivers/parisc/pdc_stable.c
> +++ b/drivers/parisc/pdc_stable.c
> @@ -274,8 +274,7 @@ pdcspath_hwpath_write(struct pdcspath_entry *entry,
> const char *buf, size_t coun
>
> /* We'll use a local copy of buf */
> count = min_t(size_t, count, sizeof(in)-1);
> - strncpy(in, buf, count);
> - in[count] = '\0';
> + strscpy(in, buf, sizeof(in));
What is "count" now needed for? Looks like a write only variable at least in
these hunks.
Eike
On 12/27/22 08:47, Rolf Eike Beer wrote:
> Am Montag, 26. Dezember 2022, 11:40:04 CET schrieb yang.yang29@zte.com.cn:
>> 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>
>> ---
>> change for v2
>> - sizeof(in) is better and simplified, thanks for Helge Deller.
>> ---
>> drivers/parisc/pdc_stable.c | 9 +++------
>> 1 file changed, 3 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/parisc/pdc_stable.c b/drivers/parisc/pdc_stable.c
>> index d6af5726ddf3..d3075445260b 100644
>> --- a/drivers/parisc/pdc_stable.c
>> +++ b/drivers/parisc/pdc_stable.c
>> @@ -274,8 +274,7 @@ pdcspath_hwpath_write(struct pdcspath_entry *entry,
>> const char *buf, size_t coun
>>
>> /* We'll use a local copy of buf */
>> count = min_t(size_t, count, sizeof(in)-1);
>> - strncpy(in, buf, count);
>> - in[count] = '\0';
>> + strscpy(in, buf, sizeof(in));
>
> What is "count" now needed for? Looks like a write only variable at least in
> these hunks.
isn't count the return value?
Helge
@@ -274,8 +274,7 @@ pdcspath_hwpath_write(struct pdcspath_entry *entry, const char *buf, size_t coun
/* We'll use a local copy of buf */
count = min_t(size_t, count, sizeof(in)-1);
- strncpy(in, buf, count);
- in[count] = '\0';
+ strscpy(in, buf, sizeof(in));
/* Let's clean up the target. 0xff is a blank pattern */
memset(&hwpath, 0xff, sizeof(hwpath));
@@ -388,8 +387,7 @@ pdcspath_layer_write(struct pdcspath_entry *entry, const char *buf, size_t count
/* We'll use a local copy of buf */
count = min_t(size_t, count, sizeof(in)-1);
- strncpy(in, buf, count);
- in[count] = '\0';
+ strscpy(in, buf, sizeof(in));
/* Let's clean up the target. 0 is a blank pattern */
memset(&layers, 0, sizeof(layers));
@@ -756,8 +754,7 @@ static ssize_t pdcs_auto_write(struct kobject *kobj,
/* We'll use a local copy of buf */
count = min_t(size_t, count, sizeof(in)-1);
- strncpy(in, buf, count);
- in[count] = '\0';
+ strscpy(in, buf, sizeof(in));
/* Current flags are stored in primary boot path entry */
pathentry = &pdcspath_entry_primary;