0003-fixheadercheck.patch 1.3 KB

1234567891011121314151617181920212223242526272829303132333435363738
  1. From dd7c8c730457def5f62ebd43022b2f06df8c6ed9 Mon Sep 17 00:00:00 2001
  2. From: Hongxu Jia <hongxu.jia@windriver.com>
  3. Date: Tue, 15 Aug 2017 17:17:20 +0800
  4. Subject: [PATCH] fixheadercheck
  5. For some binaries we can get a invalid section alignment, for example if
  6. sh_align = 1 and sh_addralign is 0. In the case of a zero size section
  7. like
  8. ".note.GNU-stack", this is irrelavent as far as I can tell and we
  9. shouldn't
  10. error in this case.
  11. RP 2014/6/11
  12. Upstream-Status: Pending
  13. Rebase to 0.170
  14. Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
  15. ---
  16. libelf/elf32_updatenull.c | 4 ++--
  17. 1 file changed, 2 insertions(+), 2 deletions(-)
  18. diff --git a/libelf/elf32_updatenull.c b/libelf/elf32_updatenull.c
  19. index 3e9ef61..5351518 100644
  20. --- a/libelf/elf32_updatenull.c
  21. +++ b/libelf/elf32_updatenull.c
  22. @@ -339,8 +339,8 @@ __elfw2(LIBELFBITS,updatenull_wrlock) (Elf *elf, int *change_bop, size_t shnum)
  23. we test for the alignment of the section being large
  24. enough for the largest alignment required by a data
  25. block. */
  26. - if (unlikely (! powerof2 (shdr->sh_addralign))
  27. - || unlikely ((shdr->sh_addralign ?: 1) < sh_align))
  28. + if (shdr->sh_size && (unlikely (! powerof2 (shdr->sh_addralign))
  29. + || unlikely ((shdr->sh_addralign ?: 1) < sh_align)))
  30. {
  31. __libelf_seterrno (ELF_E_INVALID_ALIGN);
  32. return -1;