Replace all strncpy with strlcpy

xiaoxiang781216 · jerpelea · commit 325f39530034 · 2023-05-08T09:57:01.000+02:00
Signed-off-by: Xiang Xiao &lt;xiaoxiang@xiaomi.com&gt;
diff --git a/arch/sim/src/sim/sim_rptun.c b/arch/sim/src/sim/sim_rptun.c
@@ -262,8 +262,8 @@ int sim_rptun_init(const char *shmemname, const char *cpuname, bool master)
 
   dev->master = master;
   dev->rptun.ops = &g_sim_rptun_ops;
-  strncpy(dev->cpuname, cpuname, RPMSG_NAME_SIZE);
-  strncpy(dev->shmemname, shmemname, RPMSG_NAME_SIZE);
+  strlcpy(dev->cpuname, cpuname, RPMSG_NAME_SIZE);
+  strlcpy(dev->shmemname, shmemname, RPMSG_NAME_SIZE);
   list_add_tail(&g_dev_list, &dev->node);
 
   ret = rptun_initialize(&dev->rptun);
diff --git a/arch/xtensa/src/esp32/esp32_himem_chardev.c b/arch/xtensa/src/esp32/esp32_himem_chardev.c
@@ -314,7 +314,7 @@ int himem_chardev_register(char *name, size_t size)
 
   dev->size = size;
 
-  strncpy(dev->name, name, 32);
+  strlcpy(dev->name, name, 32);
   ret = esp_himem_alloc(dev->size, &dev->mem_handle);
   if (ret != 0)
     {
diff --git a/boards/arm/imxrt/imxrt1064-evk/src/imxrt_progmem.c b/boards/arm/imxrt/imxrt1064-evk/src/imxrt_progmem.c
@@ -186,8 +186,7 @@ static int init_ota_partitions(void)
       const struct ota_partition_s *part = &g_ota_partition_table[i];
       mtd = progmem_alloc_mtdpart(part->offset, part->size);
 
-      strncpy(path, (char *)part->devpath, PARTITION_LABEL_LEN);
-      path[PARTITION_LABEL_LEN] = '\0';
+      strlcpy(path, (char *)part->devpath, PARTITION_LABEL_LEN);
 
       finfo("INFO: [label]:   %s\n", path);
       finfo("INFO: [offset]:  0x%08" PRIx32 "\n", part->offset);
diff --git a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_progmem.c b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_progmem.c
@@ -187,8 +187,7 @@ static int init_ota_partitions(void)
       const struct ota_partition_s *part = &g_ota_partition_table[i];
       mtd = progmem_alloc_mtdpart(part->offset, part->size);
 
-      strncpy(path, (char *)part->devpath, PARTITION_LABEL_LEN);
-      path[PARTITION_LABEL_LEN] = '\0';
+      strlcpy(path, (char *)part->devpath, PARTITION_LABEL_LEN);
 
       finfo("INFO: [label]:   %s\n", path);
       finfo("INFO: [offset]:  0x%08" PRIx32 "\n", part->offset);
diff --git a/drivers/modem/alt1250/altcom_hdlr.c b/drivers/modem/alt1250/altcom_hdlr.c
@@ -790,9 +790,9 @@ int32_t altcombs_set_pdninfo(struct apicmd_pdnset_s *cmd_pdn,
   for (i = 0; i < lte_pdn->ipaddr_num; i++)
     {
       lte_pdn->address[i].ip_type = cmd_pdn->ip_address[i].iptype;
-      strncpy(lte_pdn->address[i].address,
+      strlcpy(lte_pdn->address[i].address,
               (FAR char *)cmd_pdn->ip_address[i].address,
-              LTE_IPADDR_MAX_LEN - 1);
+              LTE_IPADDR_MAX_LEN);
     }
 
   lte_pdn->ims_register = cmd_pdn->imsregister == APICMD_PDN_IMS_REG ?
@@ -826,9 +826,9 @@ int32_t altcombs_set_pdninfo_v4(FAR struct apicmd_pdnset_v4_s *cmd_pdn,
   for (i = 0; i < lte_pdn->ipaddr_num; i++)
     {
       lte_pdn->address[i].ip_type = cmd_pdn->ip_address[i].iptype;
-      strncpy(lte_pdn->address[i].address,
+      strlcpy(lte_pdn->address[i].address,
               (FAR char *)cmd_pdn->ip_address[i].address,
-              LTE_IPADDR_MAX_LEN - 1);
+              LTE_IPADDR_MAX_LEN);
     }
 
   lte_pdn->ims_register = cmd_pdn->imsregister;
@@ -1420,10 +1420,10 @@ static void getver_parse_response(FAR struct apicmd_cmddat_getverres_s *resp,
                                   FAR lte_version_t *version)
 {
   memset(version, 0, sizeof(*version));
-  strncpy(version->bb_product,
-          (FAR const char *)resp->bb_product, LTE_VER_BB_PRODUCT_LEN - 1);
-  strncpy(version->np_package,
-          (FAR const char *)resp->np_package, LTE_VER_NP_PACKAGE_LEN - 1);
+  strlcpy(version->bb_product,
+          (FAR const char *)resp->bb_product, LTE_VER_BB_PRODUCT_LEN);
+  strlcpy(version->np_package,
+          (FAR const char *)resp->np_package, LTE_VER_NP_PACKAGE_LEN);
 }
 
 static void getpinset_parse_response(
@@ -1822,7 +1822,7 @@ static int copy_logfilename(FAR char *filename, size_t fnamelen,
 
       if (pathlen <= fnamelen)
         {
-          strncpy(filename, path, fnamelen);
+          strlcpy(filename, path, fnamelen);
         }
       else
         {
@@ -1977,7 +1977,7 @@ static int32_t setpinlock_pkt_compose(FAR void **arg,
     (FAR struct apicmd_cmddat_setpinlock_s *)pktbuf;
 
   out->mode = *enable;
-  strncpy((FAR char *)out->pincode, pincode, sizeof(out->pincode));
+  strlcpy((FAR char *)out->pincode, pincode, sizeof(out->pincode));
 
   size = sizeof(struct apicmd_cmddat_setpinlock_s);
 
@@ -2018,9 +2018,8 @@ static int32_t setpincode_pkt_compose(FAR void **arg,
       out->chgtype = APICMD_SETPINCODE_CHGTYPE_PIN2;
     }
 
-  strncpy((FAR char *)out->pincode, pincode, sizeof(out->pincode));
-
-  strncpy((FAR char *)out->newpincode, new_pincode, sizeof(out->newpincode));
+  strlcpy((FAR char *)out->pincode, pincode, sizeof(out->pincode));
+  strlcpy((FAR char *)out->newpincode, new_pincode, sizeof(out->newpincode));
 
   size = sizeof(struct apicmd_cmddat_setpincode_s);
 
@@ -2051,11 +2050,11 @@ static int32_t enterpin_pkt_compose(FAR void **arg,
   FAR struct apicmd_cmddat_enterpin_s *out =
     (FAR struct apicmd_cmddat_enterpin_s *)pktbuf;
 
-  strncpy((FAR char *)out->pincode, pincode, sizeof(out->pincode));
+  strlcpy((FAR char *)out->pincode, pincode, sizeof(out->pincode));
   if (new_pincode)
     {
       out->newpincodeuse = APICMD_ENTERPIN_NEWPINCODE_USE;
-      strncpy((FAR char *)out->newpincode,
+      strlcpy((FAR char *)out->newpincode,
               new_pincode, sizeof(out->newpincode));
     }
   else
@@ -2531,14 +2530,14 @@ static int32_t actpdn_pkt_compose(FAR void **arg,
   out->iptype  = apn->ip_type;
   out->authtype  = apn->auth_type;
 
-  strncpy((FAR char *)out->apnname, (FAR const char *)apn->apn,
+  strlcpy((FAR char *)out->apnname, (FAR const char *)apn->apn,
     sizeof(out->apnname));
   if (apn->auth_type != LTE_APN_AUTHTYPE_NONE)
     {
-      strncpy((FAR char *)out->username, (FAR const char *)apn->user_name,
-        sizeof(out->username));
-      strncpy((FAR char *)out->password, (FAR const char *)apn->password,
-        sizeof(out->password));
+      strlcpy((FAR char *)out->username, (FAR const char *)apn->user_name,
+              sizeof(out->username));
+      strlcpy((FAR char *)out->password, (FAR const char *)apn->password,
+              sizeof(out->password));
     }
 
   size = sizeof(struct apicmd_cmddat_activatepdn_s);
@@ -4248,7 +4247,7 @@ static int32_t getphone_pkt_parse(FAR struct alt1250_dev_s *dev,
             }
         }
 
-      strncpy(phoneno, (FAR const char *)in->phoneno, LTE_PHONENO_LEN);
+      strlcpy(phoneno, (FAR const char *)in->phoneno, LTE_PHONENO_LEN);
     }
 
   return 0;
@@ -4285,7 +4284,7 @@ static int32_t getimsi_pkt_parse(FAR struct alt1250_dev_s *dev,
             }
         }
 
-      strncpy(imsi, (FAR const char *)in->imsi, APICMD_IMSI_LEN);
+      strlcpy(imsi, (FAR const char *)in->imsi, APICMD_IMSI_LEN);
     }
 
   return 0;
@@ -4319,7 +4318,7 @@ static int32_t getimei_pkt_parse(FAR struct alt1250_dev_s *dev,
             }
         }
 
-      strncpy(imei, (FAR const char *)in->imei, LTE_IMEI_LEN);
+      strlcpy(imei, (FAR const char *)in->imei, LTE_IMEI_LEN);
     }
 
   return 0;
@@ -4455,7 +4454,7 @@ static int32_t getoper_pkt_parse(FAR struct alt1250_dev_s *dev,
                 }
             }
 
-          strncpy(oper, (FAR const char *)in->oper, LTE_OPERATOR_LEN);
+          strlcpy(oper, (FAR const char *)in->oper, LTE_OPERATOR_LEN);
         }
     }
   else if (altver == ALTCOM_VER4)
@@ -4482,7 +4481,7 @@ static int32_t getoper_pkt_parse(FAR struct alt1250_dev_s *dev,
                 }
             }
 
-          strncpy(oper, (FAR const char *)in->oper, LTE_OPERATOR_LEN);
+          strlcpy(oper, (FAR const char *)in->oper, LTE_OPERATOR_LEN);
         }
     }
 
diff --git a/libs/libc/unistd/lib_swab.c b/libs/libc/unistd/lib_swab.c
@@ -33,7 +33,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: strncpy
+ * Name: swab
  *
  * Description:
  *   The swab() function will copy nbytes bytes, which are pointed to by
diff --git a/sched/pthread/pthread_create.c b/sched/pthread/pthread_create.c
@@ -92,8 +92,7 @@ static inline void pthread_tcb_setup(FAR struct pthread_tcb_s *ptcb,
 #if CONFIG_TASK_NAME_SIZE > 0
   /* Copy the pthread name into the TCB */
 
-  strncpy(ptcb->cmn.name, parent->name, CONFIG_TASK_NAME_SIZE);
-  ptcb->cmn.name[CONFIG_TASK_NAME_SIZE] = '\0';
+  strlcpy(ptcb->cmn.name, parent->name, CONFIG_TASK_NAME_SIZE);
 #endif /* CONFIG_TASK_NAME_SIZE */
 
   /* For pthreads, args are strictly pass-by-value; that actual

Original file line number	Diff line number	Diff line change
`@@ -314,7 +314,7 @@ int himem_chardev_register(char *name, size_t size)`
`314`	`314`
`315`	`315`	`dev->size = size;`
`316`	`316`
`317`		`- strncpy(dev->name, name, 32);`
	`317`	`+ strlcpy(dev->name, name, 32);`
`318`	`318`	`ret = esp_himem_alloc(dev->size, &dev->mem_handle);`
`319`	`319`	`if (ret != 0)`
`320`	`320`	`{`
Original file line number	Diff line number	Diff line change
`@@ -790,9 +790,9 @@ int32_t altcombs_set_pdninfo(struct apicmd_pdnset_s *cmd_pdn,`
`790`	`790`	`for (i = 0; i < lte_pdn->ipaddr_num; i++)`
`791`	`791`	`{`
`792`	`792`	`lte_pdn->address[i].ip_type = cmd_pdn->ip_address[i].iptype;`
`793`		`- strncpy(lte_pdn->address[i].address,`
	`793`	`+ strlcpy(lte_pdn->address[i].address,`
`794`	`794`	`(FAR char *)cmd_pdn->ip_address[i].address,`
`795`		`- LTE_IPADDR_MAX_LEN - 1);`
	`795`	`+ LTE_IPADDR_MAX_LEN);`
`796`	`796`	`}`
`797`	`797`
`798`	`798`	`lte_pdn->ims_register = cmd_pdn->imsregister == APICMD_PDN_IMS_REG ?`
`@@ -826,9 +826,9 @@ int32_t altcombs_set_pdninfo_v4(FAR struct apicmd_pdnset_v4_s *cmd_pdn,`
`826`	`826`	`for (i = 0; i < lte_pdn->ipaddr_num; i++)`
`827`	`827`	`{`
`828`	`828`	`lte_pdn->address[i].ip_type = cmd_pdn->ip_address[i].iptype;`
`829`		`- strncpy(lte_pdn->address[i].address,`
	`829`	`+ strlcpy(lte_pdn->address[i].address,`
`830`	`830`	`(FAR char *)cmd_pdn->ip_address[i].address,`
`831`		`- LTE_IPADDR_MAX_LEN - 1);`
	`831`	`+ LTE_IPADDR_MAX_LEN);`
`832`	`832`	`}`
`833`	`833`
`834`	`834`	`lte_pdn->ims_register = cmd_pdn->imsregister;`
`@@ -1420,10 +1420,10 @@ static void getver_parse_response(FAR struct apicmd_cmddat_getverres_s *resp,`
`1420`	`1420`	`FAR lte_version_t *version)`
`1421`	`1421`	`{`
`1422`	`1422`	`memset(version, 0, sizeof(*version));`
`1423`		`- strncpy(version->bb_product,`
`1424`		`- (FAR const char *)resp->bb_product, LTE_VER_BB_PRODUCT_LEN - 1);`
`1425`		`- strncpy(version->np_package,`
`1426`		`- (FAR const char *)resp->np_package, LTE_VER_NP_PACKAGE_LEN - 1);`
	`1423`	`+ strlcpy(version->bb_product,`
	`1424`	`+ (FAR const char *)resp->bb_product, LTE_VER_BB_PRODUCT_LEN);`
	`1425`	`+ strlcpy(version->np_package,`
	`1426`	`+ (FAR const char *)resp->np_package, LTE_VER_NP_PACKAGE_LEN);`
`1427`	`1427`	`}`
`1428`	`1428`
`1429`	`1429`	`static void getpinset_parse_response(`
`@@ -1822,7 +1822,7 @@ static int copy_logfilename(FAR char *filename, size_t fnamelen,`
`1822`	`1822`
`1823`	`1823`	`if (pathlen <= fnamelen)`
`1824`	`1824`	`{`
`1825`		`- strncpy(filename, path, fnamelen);`
	`1825`	`+ strlcpy(filename, path, fnamelen);`
`1826`	`1826`	`}`
`1827`	`1827`	`else`
`1828`	`1828`	`{`
`@@ -1977,7 +1977,7 @@ static int32_t setpinlock_pkt_compose(FAR void **arg,`
`1977`	`1977`	`(FAR struct apicmd_cmddat_setpinlock_s *)pktbuf;`
`1978`	`1978`
`1979`	`1979`	`out->mode = *enable;`
`1980`		`- strncpy((FAR char *)out->pincode, pincode, sizeof(out->pincode));`
	`1980`	`+ strlcpy((FAR char *)out->pincode, pincode, sizeof(out->pincode));`
`1981`	`1981`
`1982`	`1982`	`size = sizeof(struct apicmd_cmddat_setpinlock_s);`
`1983`	`1983`
`@@ -2018,9 +2018,8 @@ static int32_t setpincode_pkt_compose(FAR void **arg,`
`2018`	`2018`	`out->chgtype = APICMD_SETPINCODE_CHGTYPE_PIN2;`
`2019`	`2019`	`}`
`2020`	`2020`
`2021`		`- strncpy((FAR char *)out->pincode, pincode, sizeof(out->pincode));`
`2022`		`-`
`2023`		`- strncpy((FAR char *)out->newpincode, new_pincode, sizeof(out->newpincode));`
	`2021`	`+ strlcpy((FAR char *)out->pincode, pincode, sizeof(out->pincode));`
	`2022`	`+ strlcpy((FAR char *)out->newpincode, new_pincode, sizeof(out->newpincode));`
`2024`	`2023`
`2025`	`2024`	`size = sizeof(struct apicmd_cmddat_setpincode_s);`
`2026`	`2025`
`@@ -2051,11 +2050,11 @@ static int32_t enterpin_pkt_compose(FAR void **arg,`
`2051`	`2050`	`FAR struct apicmd_cmddat_enterpin_s *out =`
`2052`	`2051`	`(FAR struct apicmd_cmddat_enterpin_s *)pktbuf;`
`2053`	`2052`
`2054`		`- strncpy((FAR char *)out->pincode, pincode, sizeof(out->pincode));`
	`2053`	`+ strlcpy((FAR char *)out->pincode, pincode, sizeof(out->pincode));`
`2055`	`2054`	`if (new_pincode)`
`2056`	`2055`	`{`
`2057`	`2056`	`out->newpincodeuse = APICMD_ENTERPIN_NEWPINCODE_USE;`
`2058`		`- strncpy((FAR char *)out->newpincode,`
	`2057`	`+ strlcpy((FAR char *)out->newpincode,`
`2059`	`2058`	`new_pincode, sizeof(out->newpincode));`
`2060`	`2059`	`}`
`2061`	`2060`	`else`
`@@ -2531,14 +2530,14 @@ static int32_t actpdn_pkt_compose(FAR void **arg,`
`2531`	`2530`	`out->iptype = apn->ip_type;`
`2532`	`2531`	`out->authtype = apn->auth_type;`
`2533`	`2532`
`2534`		`- strncpy((FAR char )out->apnname, (FAR const char )apn->apn,`
	`2533`	`+ strlcpy((FAR char )out->apnname, (FAR const char )apn->apn,`
`2535`	`2534`	`sizeof(out->apnname));`
`2536`	`2535`	`if (apn->auth_type != LTE_APN_AUTHTYPE_NONE)`
`2537`	`2536`	`{`
`2538`		`- strncpy((FAR char )out->username, (FAR const char )apn->user_name,`
`2539`		`- sizeof(out->username));`
`2540`		`- strncpy((FAR char )out->password, (FAR const char )apn->password,`
`2541`		`- sizeof(out->password));`
	`2537`	`+ strlcpy((FAR char )out->username, (FAR const char )apn->user_name,`
	`2538`	`+ sizeof(out->username));`
	`2539`	`+ strlcpy((FAR char )out->password, (FAR const char )apn->password,`
	`2540`	`+ sizeof(out->password));`
`2542`	`2541`	`}`
`2543`	`2542`
`2544`	`2543`	`size = sizeof(struct apicmd_cmddat_activatepdn_s);`
`@@ -4248,7 +4247,7 @@ static int32_t getphone_pkt_parse(FAR struct alt1250_dev_s *dev,`
`4248`	`4247`	`}`
`4249`	`4248`	`}`
`4250`	`4249`
`4251`		`- strncpy(phoneno, (FAR const char *)in->phoneno, LTE_PHONENO_LEN);`
	`4250`	`+ strlcpy(phoneno, (FAR const char *)in->phoneno, LTE_PHONENO_LEN);`
`4252`	`4251`	`}`
`4253`	`4252`
`4254`	`4253`	`return 0;`
`@@ -4285,7 +4284,7 @@ static int32_t getimsi_pkt_parse(FAR struct alt1250_dev_s *dev,`
`4285`	`4284`	`}`
`4286`	`4285`	`}`
`4287`	`4286`
`4288`		`- strncpy(imsi, (FAR const char *)in->imsi, APICMD_IMSI_LEN);`
	`4287`	`+ strlcpy(imsi, (FAR const char *)in->imsi, APICMD_IMSI_LEN);`
`4289`	`4288`	`}`
`4290`	`4289`
`4291`	`4290`	`return 0;`
`@@ -4319,7 +4318,7 @@ static int32_t getimei_pkt_parse(FAR struct alt1250_dev_s *dev,`
`4319`	`4318`	`}`
`4320`	`4319`	`}`
`4321`	`4320`
`4322`		`- strncpy(imei, (FAR const char *)in->imei, LTE_IMEI_LEN);`
	`4321`	`+ strlcpy(imei, (FAR const char *)in->imei, LTE_IMEI_LEN);`
`4323`	`4322`	`}`
`4324`	`4323`
`4325`	`4324`	`return 0;`
`@@ -4455,7 +4454,7 @@ static int32_t getoper_pkt_parse(FAR struct alt1250_dev_s *dev,`
`4455`	`4454`	`}`
`4456`	`4455`	`}`
`4457`	`4456`
`4458`		`- strncpy(oper, (FAR const char *)in->oper, LTE_OPERATOR_LEN);`
	`4457`	`+ strlcpy(oper, (FAR const char *)in->oper, LTE_OPERATOR_LEN);`
`4459`	`4458`	`}`
`4460`	`4459`	`}`
`4461`	`4460`	`else if (altver == ALTCOM_VER4)`
`@@ -4482,7 +4481,7 @@ static int32_t getoper_pkt_parse(FAR struct alt1250_dev_s *dev,`
`4482`	`4481`	`}`
`4483`	`4482`	`}`
`4484`	`4483`
`4485`		`- strncpy(oper, (FAR const char *)in->oper, LTE_OPERATOR_LEN);`
	`4484`	`+ strlcpy(oper, (FAR const char *)in->oper, LTE_OPERATOR_LEN);`
`4486`	`4485`	`}`
`4487`	`4486`	`}`
`4488`	`4487`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`****************************************************************************/`
`34`	`34`
`35`	`35`	`/****************************************************************************`
`36`		`- * Name: strncpy`
	`36`	`+ * Name: swab`
`37`	`37`	`*`
`38`	`38`	`* Description:`
`39`	`39`	`* The swab() function will copy nbytes bytes, which are pointed to by`