Skip to contentSkip to conversation

remoteproc: elf_loader: fix program header parsing

PATCH New Fabien Dessenne 4 participants 4 messages Sep 4, 2019 – Jan 25, 2020 Remote processor (remoteproc)

lore
Share & tools
lore
#0 lore raw

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
index 67937a7..23d502d 100644
@@ -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
#1 lore raw

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_type is different from PT_LOAD the phdr pointer must be incremented.

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
index 67937a7..23d502d 100644
@@ -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;
#2 lore raw

PATCH 1/1 remoteproc: elf_loader: fix program header parsing

In reply to Fabien Dessenne
Quoted 3 lines · Fabien Dessenne

Fix an issue where some sections are never loaded : if p_type is different from PT_LOAD the phdr pointer must be incremented.

Good catch Fabien.

Fixes 7a7c4cb0f044 ("remoteproc: add elf file load support")
Quoted 1 line

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
index 67937a7..23d502d 100644
@@ -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;
#3 lore raw

PATCH 1/1 remoteproc: elf_loader: fix program header parsing

In reply to Fabien Dessenne
Quoted 5 lines · Fabien Dessenne

Fix an issue where some sections are never loaded : if p_type is different from PT_LOAD the phdr pointer must be incremented.

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>