Skip to contentSkip to conversation

MIPS: OCTEON: cvmx-bootmem: use strscpy() to instead of strncpy()

PATCH Applied [email protected] 3 participants 3 messages Dec 3, 2022 – Dec 8, 2022 MIPS

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 MIPS: OCTEON: cvmx-bootmem: use strscpy() to instead of strncpy()

From: Xu Panda <[email protected]>

The implementation of strscpy() is more robust and safer.

---
 arch/mips/cavium-octeon/executive/cvmx-bootmem.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
arch/mips/cavium-octeon/executive/cvmx-bootmem.c +1 -2
index 306cee07ce3f..334bf8e577e5 100644
@@ -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))
Signature · 1 line
2.15.2
maintainer Applied
#2 lore raw

Re: [PATCH linux-next] MIPS: OCTEON: cvmx-bootmem: use strscpy() to instead of? strncpy()

In reply to [email protected]
Quoted 27 lines · On Sat, Dec 03, 2022 at 02:17:16PM +0800, [email protected] wrote:

From: Xu Panda <[email protected]>

The implementation of strscpy() is more robust and safer.

---
 arch/mips/cavium-octeon/executive/cvmx-bootmem.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
arch/mips/cavium-octeon/executive/cvmx-bootmem.c +1 -2
index 306cee07ce3f..334bf8e577e5 100644
@@ -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))
Signature · 1 line
2.15.2

applied to mips-next.

Thomas.

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