diff options
| author | Tom Rini <trini@konsulko.com> | 2021-04-13 09:50:45 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-04-13 09:50:45 -0400 |
| commit | a94ab561e2f49a80d8579930e840b810ab1a1330 (patch) | |
| tree | 77913e7bd9309afa6b2ddc6f3e3e49827da2025c /drivers/fastboot/fb_mmc.c | |
| parent | 3b676a1662ac6b54d1e97ea40a0c41ee0925ffe3 (diff) | |
| parent | 8c4e3b79bd0bb76eea16869e9666e19047c0d005 (diff) | |
Merge branch '2021-04-13-assorted-improvements'
- A large assortment of bug fixes, code cleanups and a few feature
enhancements.
Diffstat (limited to 'drivers/fastboot/fb_mmc.c')
| -rw-r--r-- | drivers/fastboot/fb_mmc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/fastboot/fb_mmc.c b/drivers/fastboot/fb_mmc.c index 8e74e50e918..2f3837e5591 100644 --- a/drivers/fastboot/fb_mmc.c +++ b/drivers/fastboot/fb_mmc.c @@ -40,7 +40,7 @@ static int raw_part_get_info_by_name(struct blk_desc *dev_desc, /* check for raw partition descriptor */ strcpy(env_desc_name, "fastboot_raw_partition_"); - strncat(env_desc_name, name, PART_NAME_LEN); + strlcat(env_desc_name, name, PART_NAME_LEN); raw_part_desc = strdup(env_get(env_desc_name)); if (raw_part_desc == NULL) return -ENODEV; @@ -61,7 +61,7 @@ static int raw_part_get_info_by_name(struct blk_desc *dev_desc, info->start = simple_strtoul(argv[0], NULL, 0); info->size = simple_strtoul(argv[1], NULL, 0); info->blksz = dev_desc->blksz; - strncpy((char *)info->name, name, PART_NAME_LEN); + strlcpy((char *)info->name, name, PART_NAME_LEN); if (raw_part_desc) { if (strcmp(strsep(&raw_part_desc, " "), "mmcpart") == 0) { @@ -114,7 +114,7 @@ static int part_get_info_by_name_or_alias(struct blk_desc **dev_desc, /* check for alias */ strcpy(env_alias_name, "fastboot_partition_alias_"); - strncat(env_alias_name, name, PART_NAME_LEN); + strlcat(env_alias_name, name, PART_NAME_LEN); aliased_part_name = env_get(env_alias_name); if (aliased_part_name != NULL) ret = do_get_part_info(dev_desc, aliased_part_name, |