We currently have only one place which iterates over elf segments, but there are more to come, so add an iterator for it.
Signed-off-by: Sascha Hauer <[email protected]> --- common/elf.c | 8 +++----- include/elf.h | 6 ++++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/common/elf.c b/common/elf.c index f772018deb..af73396b35 100644 --- a/common/elf.c +++ b/common/elf.c @@ -161,19 +161,17 @@ static int load_elf_to_memory(struct elf_image *elf) static int load_elf_image_segments(struct elf_image *elf) { void *buf = elf->hdr_buf; - void *phdr = (void *) (buf + elf_hdr_e_phoff(elf, buf)); - int i, ret; + void *phdr; + int ret; /* File as already been loaded */ if (!list_empty(&elf->list)) return -EINVAL; - for (i = 0; i < elf_hdr_e_phnum(elf, buf) ; ++i) { + elf_for_each_segment(phdr, elf, buf) { ret = request_elf_segment(elf, phdr); if (ret) goto elf_release_regions; - - phdr += elf_size_of_phdr(elf); } /* diff --git a/include/elf.h b/include/elf.h index 994db642b0..dc1aa8d5d1 100644 --- a/include/elf.h +++ b/include/elf.h @@ -439,4 +439,10 @@ static inline unsigned long elf_size_of_phdr(struct elf_image *elf) return sizeof(Elf64_Phdr); } +#define elf_for_each_segment(phdr, elf, buf) \ + for (phdr = (void *)buf + elf_hdr_e_phoff(elf, buf); \ + phdr < (void *)buf + elf_hdr_e_phoff(elf, buf) + \ + elf_hdr_e_phnum(elf, buf) * elf_size_of_phdr(elf); \ + phdr = (void *)phdr + elf_size_of_phdr(elf)) + #endif /* _LINUX_ELF_H */ -- 2.47.3
