Merge branch '2022-08-04-Kconfig-migrations'

[platform/kernel/u-boot.git] / drivers / fastboot / fb_mmc.c

diff --git a/drivers/fastboot/fb_mmc.c b/drivers/fastboot/fb_mmc.c
index 8e74e50..033c510 100644 (file)
--- a/drivers/fastboot/fb_mmc.c
+++ b/drivers/fastboot/fb_mmc.c
@@ -10,7 +10,6 @@
 #include <fastboot.h>
 #include <fastboot-internal.h>
 #include <fb_mmc.h>
-#include <flash.h>
 #include <image-sparse.h>
 #include <image.h>
 #include <log.h>
@@ -40,7 +39,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, sizeof(env_desc_name));
        raw_part_desc = strdup(env_get(env_desc_name));
        if (raw_part_desc == NULL)
                return -ENODEV;
@@ -61,7 +60,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) {
@@ -104,23 +103,18 @@ static int part_get_info_by_name_or_alias(struct blk_desc **dev_desc,
                                          const char *name,
                                          struct disk_partition *info)
 {
-       int ret;
-
-       ret = do_get_part_info(dev_desc, name, info);
-       if (ret < 0) {
-               /* strlen("fastboot_partition_alias_") + PART_NAME_LEN + 1 */
-               char env_alias_name[25 + PART_NAME_LEN + 1];
-               char *aliased_part_name;
-
-               /* check for alias */
-               strcpy(env_alias_name, "fastboot_partition_alias_");
-               strncat(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,
-                                              info);
-       }
-       return ret;
+       /* strlen("fastboot_partition_alias_") + PART_NAME_LEN + 1 */
+       char env_alias_name[25 + PART_NAME_LEN + 1];
+       char *aliased_part_name;
+
+       /* check for alias */
+       strlcpy(env_alias_name, "fastboot_partition_alias_", sizeof(env_alias_name));
+       strlcat(env_alias_name, name, sizeof(env_alias_name));
+       aliased_part_name = env_get(env_alias_name);
+       if (aliased_part_name)
+               name = aliased_part_name;
+
+       return do_get_part_info(dev_desc, name, info);
 }
 
 /**
@@ -289,7 +283,7 @@ static void fb_mmc_boot_ops(struct blk_desc *dev_desc, void *buffer,
  * @param[in] info Boot partition info
  * @param[out] hdr Where to store read boot image header
  *
- * @return Boot image header sectors count or 0 on error
+ * Return: Boot image header sectors count or 0 on error
  */
 static lbaint_t fb_mmc_get_boot_header(struct blk_desc *dev_desc,
                                       struct disk_partition *info,
@@ -336,7 +330,7 @@ static lbaint_t fb_mmc_get_boot_header(struct blk_desc *dev_desc,
  * @param download_buffer Address to fastboot buffer with zImage in it
  * @param download_bytes Size of fastboot buffer, in bytes
  *
- * @return 0 on success or -1 on error
+ * Return: 0 on success or -1 on error
  */
 static int fb_mmc_update_zimage(struct blk_desc *dev_desc,
                                void *download_buffer,
@@ -512,7 +506,7 @@ void fastboot_mmc_flash_write(const char *cmd, void *download_buffer,
                              u32 download_bytes, char *response)
 {
        struct blk_desc *dev_desc;
-       struct disk_partition info;
+       struct disk_partition info = {0};
 
 #ifdef CONFIG_FASTBOOT_MMC_BOOT_SUPPORT
        if (strcmp(cmd, CONFIG_FASTBOOT_MMC_BOOT1_NAME) == 0) {
@@ -525,19 +519,14 @@ void fastboot_mmc_flash_write(const char *cmd, void *download_buffer,
        if (strcmp(cmd, CONFIG_FASTBOOT_MMC_BOOT2_NAME) == 0) {
                dev_desc = fastboot_mmc_get_dev(response);
                if (dev_desc)
-                       fb_mmc_boot_ops(dev_desc, download_buffer, 1,
+                       fb_mmc_boot_ops(dev_desc, download_buffer, 2,
                                        download_bytes, response);
                return;
        }
 #endif
 
 #if CONFIG_IS_ENABLED(EFI_PARTITION)
-#ifndef CONFIG_FASTBOOT_MMC_USER_SUPPORT
        if (strcmp(cmd, CONFIG_FASTBOOT_GPT_NAME) == 0) {
-#else
-       if (strcmp(cmd, CONFIG_FASTBOOT_GPT_NAME) == 0 ||
-           strcmp(cmd, CONFIG_FASTBOOT_MMC_USER_NAME) == 0) {
-#endif
                dev_desc = fastboot_mmc_get_dev(response);
                if (!dev_desc)
                        return;
@@ -599,7 +588,20 @@ void fastboot_mmc_flash_write(const char *cmd, void *download_buffer,
        }
 #endif
 
-       if (fastboot_mmc_get_part_info(cmd, &dev_desc, &info, response) < 0)
+#if CONFIG_IS_ENABLED(FASTBOOT_MMC_USER_SUPPORT)
+       if (strcmp(cmd, CONFIG_FASTBOOT_MMC_USER_NAME) == 0) {
+               dev_desc = fastboot_mmc_get_dev(response);
+               if (!dev_desc)
+                       return;
+
+               strlcpy((char *)&info.name, cmd, sizeof(info.name));
+               info.size       = dev_desc->lba;
+               info.blksz      = dev_desc->blksz;
+       }
+#endif
+
+       if (!info.name[0] &&
+           fastboot_mmc_get_part_info(cmd, &dev_desc, &info, response) < 0)
                return;
 
        if (is_sparse_image(download_buffer)) {
@@ -655,7 +657,7 @@ void fastboot_mmc_erase(const char *cmd, char *response)
                /* erase EMMC boot2 */
                dev_desc = fastboot_mmc_get_dev(response);
                if (dev_desc)
-                       fb_mmc_boot_ops(dev_desc, NULL, 1, 0, response);
+                       fb_mmc_boot_ops(dev_desc, NULL, 2, 0, response);
                return;
        }
 #endif