[linux-next] MIPS: OCTEON: cvmx-bootmem: 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.
Signed-off-by: Xu Panda <xu.panda@zte.com.cn>
Signed-off-by: Yang Yang <yang.yang29@zte.com>
---
arch/mips/cavium-octeon/executive/cvmx-bootmem.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
Comments
On 3/12/22 07:17, yang.yang29@zte.com.cn wrote:
> From: Xu Panda <xu.panda@zte.com.cn>
>
> The implementation of strscpy() is more robust and safer.
>
> Signed-off-by: Xu Panda <xu.panda@zte.com.cn>
> Signed-off-by: Yang Yang <yang.yang29@zte.com>
> ---
> arch/mips/cavium-octeon/executive/cvmx-bootmem.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
On Sat, Dec 03, 2022 at 02:17:16PM +0800, yang.yang29@zte.com.cn wrote:
> From: Xu Panda <xu.panda@zte.com.cn>
>
> The implementation of strscpy() is more robust and safer.
>
> Signed-off-by: Xu Panda <xu.panda@zte.com.cn>
> Signed-off-by: Yang Yang <yang.yang29@zte.com>
> ---
> arch/mips/cavium-octeon/executive/cvmx-bootmem.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/arch/mips/cavium-octeon/executive/cvmx-bootmem.c b/arch/mips/cavium-octeon/executive/cvmx-bootmem.c
> index 306cee07ce3f..334bf8e577e5 100644
> --- a/arch/mips/cavium-octeon/executive/cvmx-bootmem.c
> +++ b/arch/mips/cavium-octeon/executive/cvmx-bootmem.c
> @@ -780,9 +780,8 @@ int64_t cvmx_bootmem_phy_named_block_alloc(uint64_t size, uint64_t min_addr,
> if (addr_allocated >= 0) {
> named_block_desc_ptr->base_addr = addr_allocated;
> named_block_desc_ptr->size = size;
> - strncpy(named_block_desc_ptr->name, name,
> + strscpy(named_block_desc_ptr->name, name,
> cvmx_bootmem_desc->named_block_name_len);
> - named_block_desc_ptr->name[cvmx_bootmem_desc->named_block_name_len - 1] = 0;
> }
>
> if (!(flags & CVMX_BOOTMEM_FLAG_NO_LOCKING))
> --
> 2.15.2
applied to mips-next.
Thomas.
@@ -780,9 +780,8 @@ int64_t cvmx_bootmem_phy_named_block_alloc(uint64_t size, uint64_t min_addr,
if (addr_allocated >= 0) {
named_block_desc_ptr->base_addr = addr_allocated;
named_block_desc_ptr->size = size;
- strncpy(named_block_desc_ptr->name, name,
+ strscpy(named_block_desc_ptr->name, name,
cvmx_bootmem_desc->named_block_name_len);
- named_block_desc_ptr->name[cvmx_bootmem_desc->named_block_name_len - 1] = 0;
}
if (!(flags & CVMX_BOOTMEM_FLAG_NO_LOCKING))