| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | For some binaries we can get a invalid section alignment, for example if |
| 2 | sh_align = 1 and sh_addralign is 0. In the case of a zero size section like |
| 3 | ".note.GNU-stack", this is irrelavent as far as I can tell and we shouldn't |
| 4 | error in this case. |
| 5 | |
| 6 | RP 2014/6/11 |
| 7 | |
| 8 | Upstream-Status: Pending |
| 9 | |
| 10 | diff --git a/libelf/elf32_updatenull.c b/libelf/elf32_updatenull.c |
| 11 | --- a/libelf/elf32_updatenull.c |
| 12 | +++ b/libelf/elf32_updatenull.c |
| 13 | @@ -339,8 +339,8 @@ __elfw2(LIBELFBITS,updatenull_wrlock) (Elf *elf, int *change_bop, size_t shnum) |
| 14 | we test for the alignment of the section being large |
| 15 | enough for the largest alignment required by a data |
| 16 | block. */ |
| 17 | - if (unlikely (! powerof2 (shdr->sh_addralign)) |
| 18 | - || unlikely ((shdr->sh_addralign ?: 1) < sh_align)) |
| 19 | + if (shdr->sh_size && (unlikely (! powerof2 (shdr->sh_addralign)) |
| 20 | + || unlikely ((shdr->sh_addralign ?: 1) < sh_align))) |
| 21 | { |
| 22 | __libelf_seterrno (ELF_E_INVALID_ALIGN); |
| 23 | return -1; |