remoteproc: elf_loader: fix program header parsing
PATCH 1/1 remoteproc: elf_loader: fix program header parsing
Fix an issue where some sections are never loaded : if p_type is different from PT_LOAD the phdr pointer must be incremented.
--- drivers/remoteproc/rproc-elf-loader.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/remoteproc/rproc-elf-loader.c +1 -2
@@ -78,7 +78,7 @@ int rproc_elf32_load_image(struct udevice *dev, unsigned long addr) ops =rproc_get_ops (dev);/* Load each program header */ -for (i =0 ; i < ehdr->e_phnum; ++i) { +for (i =0 ; i < ehdr->e_phnum; i++, phdr++) {void *dst = (void *)(uintptr_t )phdr->p_paddr;void *src = (void *)addr + phdr->p_offset;
@@ -99,7 +99,6 @@ int rproc_elf32_load_image(struct udevice *dev, unsigned long addr)roundup ((unsigned long )dst + phdr->p_filesz,ARCH_DMA_MINALIGN ) - rounddown((unsigned long)dst, ARCH_DMA_MINALIGN)); - ++phdr; }return 0 ;
Signature · 1 line
2.7.4
PATCH 1/1 remoteproc: elf_loader: fix program header parsing
Quoted 4 lines · Fabien Dessenne
Fix an issue where some sections are never loaded : if
p_typeis different fromPT_LOADthe phdr pointer must be incremented.Signed-off-by Fabien Dessenne <[email protected]>
Thanks and regards,
Lokesh
Quoted 26 lines
--- drivers/remoteproc/rproc-elf-loader.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)drivers/remoteproc/rproc-elf-loader.c +1
-2@@ -78,7 +78,7 @@ int rproc_elf32_load_image(struct udevice *dev, unsigned long addr) ops =rproc_get_ops (dev);/* Load each program header */ -for (i =0 ; i < ehdr->e_phnum; ++i) { +for (i =0 ; i < ehdr->e_phnum; i++, phdr++) {void *dst = (void *)(uintptr_t )phdr->p_paddr;void *src = (void *)addr + phdr->p_offset;@@ -99,7 +99,6 @@ int rproc_elf32_load_image(struct udevice *dev, unsigned long addr)roundup ((unsigned long )dst + phdr->p_filesz,ARCH_DMA_MINALIGN ) - rounddown((unsigned long)dst, ARCH_DMA_MINALIGN)); - ++phdr; }return 0 ;
PATCH 1/1 remoteproc: elf_loader: fix program header parsing
In reply to Fabien DessenneQuoted 3 lines · Fabien Dessenne
Fix an issue where some sections are never loaded : if
p_typeis different fromPT_LOADthe phdr pointer must be incremented.
Good catch Fabien.
Quoted 1 line
Signed-off-by Fabien Dessenne <[email protected]>
regards
Suman
Quoted 26 lines
--- drivers/remoteproc/rproc-elf-loader.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)drivers/remoteproc/rproc-elf-loader.c +1
-2@@ -78,7 +78,7 @@ int rproc_elf32_load_image(struct udevice *dev, unsigned long addr) ops =rproc_get_ops (dev);/* Load each program header */ -for (i =0 ; i < ehdr->e_phnum; ++i) { +for (i =0 ; i < ehdr->e_phnum; i++, phdr++) {void *dst = (void *)(uintptr_t )phdr->p_paddr;void *src = (void *)addr + phdr->p_offset;@@ -99,7 +99,6 @@ int rproc_elf32_load_image(struct udevice *dev, unsigned long addr)roundup ((unsigned long )dst + phdr->p_filesz,ARCH_DMA_MINALIGN ) - rounddown((unsigned long)dst, ARCH_DMA_MINALIGN)); - ++phdr; }return 0 ;
PATCH 1/1 remoteproc: elf_loader: fix program header parsing
In reply to Fabien DessenneQuoted 5 lines · Fabien Dessenne
Fix an issue where some sections are never loaded : if
p_typeis different fromPT_LOADthe phdr pointer must be incremented.Signed-off-by Fabien Dessenne <[email protected]>Acked-by Suman Anna <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200125/06077185/attachment.sig>