linux-mips.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH linux-next] MIPS: OCTEON: cvmx-bootmem: use strscpy() to instead of  strncpy()
@ 2022-12-03  6:17 yang.yang29
  2022-12-03 13:11 ` Philippe Mathieu-Daudé
  2022-12-08 10:36 ` [PATCH linux-next] MIPS: OCTEON: cvmx-bootmem: use strscpy() to instead of? strncpy() Thomas Bogendoerfer
  0 siblings, 2 replies; 3+ messages in thread
From: yang.yang29 @ 2022-12-03  6:17 UTC (permalink / raw)
  To: tsbogend; +Cc: julia.lawall, linux-mips, linux-kernel, xu.panda, yang.yang29

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

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH linux-next] MIPS: OCTEON: cvmx-bootmem: use strscpy() to instead of strncpy()
  2022-12-03  6:17 [PATCH linux-next] MIPS: OCTEON: cvmx-bootmem: use strscpy() to instead of strncpy() yang.yang29
@ 2022-12-03 13:11 ` Philippe Mathieu-Daudé
  2022-12-08 10:36 ` [PATCH linux-next] MIPS: OCTEON: cvmx-bootmem: use strscpy() to instead of? strncpy() Thomas Bogendoerfer
  1 sibling, 0 replies; 3+ messages in thread
From: Philippe Mathieu-Daudé @ 2022-12-03 13:11 UTC (permalink / raw)
  To: yang.yang29, tsbogend; +Cc: julia.lawall, linux-mips, linux-kernel, xu.panda

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>


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH linux-next] MIPS: OCTEON: cvmx-bootmem: use strscpy() to instead of? strncpy()
  2022-12-03  6:17 [PATCH linux-next] MIPS: OCTEON: cvmx-bootmem: use strscpy() to instead of strncpy() yang.yang29
  2022-12-03 13:11 ` Philippe Mathieu-Daudé
@ 2022-12-08 10:36 ` Thomas Bogendoerfer
  1 sibling, 0 replies; 3+ messages in thread
From: Thomas Bogendoerfer @ 2022-12-08 10:36 UTC (permalink / raw)
  To: yang.yang29; +Cc: julia.lawall, linux-mips, linux-kernel, xu.panda

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.

-- 
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea.                                                [ RFC1925, 2.3 ]

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2022-12-08 11:00 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-03  6:17 [PATCH linux-next] MIPS: OCTEON: cvmx-bootmem: use strscpy() to instead of strncpy() yang.yang29
2022-12-03 13:11 ` Philippe Mathieu-Daudé
2022-12-08 10:36 ` [PATCH linux-next] MIPS: OCTEON: cvmx-bootmem: use strscpy() to instead of? strncpy() Thomas Bogendoerfer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).