LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remoteproc: elf_loader: Always check the validity of the image before loading 

rproc_elf32_load_image() rely on user to send a valid address for elf loading.
Instead do a sanity check on the address passed by user. This will help
all rproc elf users to not call sanity_check explicitly before calling
elf_loading.

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Reviewed-by: Fabien Dessenne <fabien.dessenne@st.com>
This commit is contained in:
Lokesh Vutla 2019-09-04 16:01:28 +05:30 committed by Tom Rini
parent c08eb93626
commit 14d963d1b5
4 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/remoteproc/rproc-elf-loader.c
View File

@ -64,13 +64,18 @@ int rproc_elf32_sanity_check(ulong addr, ulong size)
return 0; return 0;
} }
/* A very simple elf loader, assumes the image is valid */ int rproc_elf32_load_image(struct udevice *dev, unsigned long addr, ulong size)
int rproc_elf32_load_image(struct udevice *dev, unsigned long addr)
{ {
Elf32_Ehdr *ehdr; /* Elf header structure pointer */ Elf32_Ehdr *ehdr; /* Elf header structure pointer */
Elf32_Phdr *phdr; /* Program header structure pointer */ Elf32_Phdr *phdr; /* Program header structure pointer */
const struct dm_rproc_ops *ops; const struct dm_rproc_ops *ops;
unsigned int i; unsigned int i, ret;
ret = rproc_elf32_sanity_check(addr, size);
if (ret) {
dev_err(dev, "Invalid ELF32 Image %d\n", ret);
return ret;
}
ehdr = (Elf32_Ehdr *)addr; ehdr = (Elf32_Ehdr *)addr;
phdr = (Elf32_Phdr *)(addr + ehdr->e_phoff); phdr = (Elf32_Phdr *)(addr + ehdr->e_phoff);

9
drivers/remoteproc/stm32_copro.c
View File

@ -155,14 +155,7 @@ static int stm32_copro_load(struct udevice *dev, ulong addr, ulong size)
return ret; return ret;
} }
/* Support only ELF32 image */ return rproc_elf32_load_image(dev, addr, size);
ret = rproc_elf32_sanity_check(addr, size);
if (ret) {
dev_err(dev, "Invalid ELF32 image (%d)\n", ret);
return ret;
}
return rproc_elf32_load_image(dev, addr);
} }
/** /**

6
include/remoteproc.h
View File

@ -218,9 +218,10 @@ int rproc_elf32_sanity_check(ulong addr, ulong size);
* rproc_elf32_load_image() - load an ELF32 image * rproc_elf32_load_image() - load an ELF32 image
* @dev: device loading the ELF32 image * @dev: device loading the ELF32 image
* @addr: valid ELF32 image address * @addr: valid ELF32 image address
* @size: size of the image
* @return 0 if the image is successfully loaded, else appropriate error value. * @return 0 if the image is successfully loaded, else appropriate error value.
*/ */
int rproc_elf32_load_image(struct udevice *dev, unsigned long addr); int rproc_elf32_load_image(struct udevice *dev, unsigned long addr, ulong size);
#else #else
static inline int rproc_init(void) { return -ENOSYS; } static inline int rproc_init(void) { return -ENOSYS; }
static inline int rproc_dev_init(int id) { return -ENOSYS; } static inline int rproc_dev_init(int id) { return -ENOSYS; }
@ -234,7 +235,8 @@ static inline int rproc_is_running(int id) { return -ENOSYS; }
static inline int rproc_elf32_sanity_check(ulong addr, static inline int rproc_elf32_sanity_check(ulong addr,
ulong size) { return -ENOSYS; } ulong size) { return -ENOSYS; }
static inline int rproc_elf32_load_image(struct udevice *dev, static inline int rproc_elf32_load_image(struct udevice *dev,
unsigned long addr) { return -ENOSYS; } unsigned long addr, ulong size)
{ return -ENOSYS; }
#endif #endif
#endif /* _RPROC_H_ */ #endif /* _RPROC_H_ */

5
test/dm/remoteproc.c
View File

@ -171,11 +171,8 @@ static int dm_test_remoteproc_elf(struct unit_test_state *uts)
ut_assertnonnull(loaded_firmware); ut_assertnonnull(loaded_firmware);
memset(loaded_firmware, 0, loaded_firmware_size); memset(loaded_firmware, 0, loaded_firmware_size);
/* Verify valid ELF format */
ut_assertok(rproc_elf32_sanity_check((ulong)valid_elf32, size));
/* Load firmware in loaded_firmware, and verify it */ /* Load firmware in loaded_firmware, and verify it */
ut_assertok(rproc_elf32_load_image(dev, (unsigned long)valid_elf32)); ut_assertok(rproc_elf32_load_image(dev, (ulong)valid_elf32, size));
ut_assertok(memcmp(loaded_firmware, valid_elf32, loaded_firmware_size)); ut_assertok(memcmp(loaded_firmware, valid_elf32, loaded_firmware_size));
unmap_physmem(loaded_firmware, MAP_NOCACHE); unmap_physmem(loaded_firmware, MAP_NOCACHE);