Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 07:04:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

imx: parse-container: Use malloc for container processing

Browse source 
If the container has image which conflicts with
spl_get_load_buffer address, there are processing failures.
Use malloc instead of spl_get_load_buffer.

Reviewed-by: Ye Li <ye.li@nxp.com>
Signed-off-by: Nitin Garg <nitin.garg@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
This commit is contained in:
Nitin Garg 2023-06-15 18:09:22 +08:00 committed by Stefano Babic
parent dc2d49209e
commit 6e81ca220e
1 changed files with 27 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
arch/arm/mach-imx/parse-container.c
View file

@ -4,6 +4,7 @@
*/
#include <common.h>
#include <stdlib.h>
#include <errno.h>
#include <log.h>
#include <spl.h>
@ -134,21 +135,27 @@ static int read_auth_container(struct spl_image_info *spl_image,
* It will not override the ATF code, so safe to use it here,
* no need malloc
*/
container = (struct container_hdr *)spl_get_load_buffer(-size, size);
container = malloc(size);
if (!container)
return -ENOMEM;
debug("%s: container: %p sector: %lu sectors: %u\n", __func__,
container, sector, sectors);
if (info->read(info, sector, sectors, container) != sectors)
return -EIO;
if (info->read(info, sector, sectors, container) != sectors) {
ret = -EIO;
goto end;
}
if (container->tag != 0x87 && container->version != 0x0) {
printf("Wrong container header\n");
return -ENOENT;
printf("Wrong container header");
ret = -ENOENT;
goto end;
}
if (!container->num_images) {
printf("Wrong container, no image found\n");
return -ENOENT;
printf("Wrong container, no image found");
ret = -ENOENT;
goto end;
}
length = container->length_lsb + (container->length_msb << 8);
@ -158,13 +165,18 @@ static int read_auth_container(struct spl_image_info *spl_image,
size = roundup(length, info->bl_len);
sectors = size / info->bl_len;
container = (struct container_hdr *)spl_get_load_buffer(-size, size);
free(container);
container = malloc(size);
if (!container)
return -ENOMEM;
debug("%s: container: %p sector: %lu sectors: %u\n",
__func__, container, sector, sectors);
if (info->read(info, sector, sectors, container) !=
sectors)
return -EIO;
sectors) {
ret = -EIO;
goto end;
}
}
#ifdef CONFIG_AHAB_BOOT
@ -175,7 +187,7 @@ static int read_auth_container(struct spl_image_info *spl_image,
SECO_LOCAL_SEC_SEC_SECURE_RAM_BASE);
if (ret) {
printf("authenticate container hdr failed, return %d\n", ret);
return ret;
goto end_auth;
}
#endif
@ -200,6 +212,10 @@ end_auth:
if (sc_seco_authenticate(-1, SC_SECO_REL_CONTAINER, 0))
printf("Error: release container failed!\n");
#endif
end:
free(container);
return ret;
}