From 565d5935abf5b58773f9c8385c00189221980d98 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Tue, 15 Aug 2017 17:17:20 +0800 Subject: [PATCH 3/7] fixheadercheck For some binaries we can get a invalid section alignment, for example if sh_align = 1 and sh_addralign is 0. In the case of a zero size section like ".note.GNU-stack", this is irrelavent as far as I can tell and we shouldn't error in this case. RP 2014/6/11 Upstream-Status: Pending Rebase to 0.170 Signed-off-by: Hongxu Jia --- libelf/elf32_updatenull.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libelf/elf32_updatenull.c b/libelf/elf32_updatenull.c index d83c0b3..a51bf70 100644 --- a/libelf/elf32_updatenull.c +++ b/libelf/elf32_updatenull.c @@ -339,8 +339,8 @@ __elfw2(LIBELFBITS,updatenull_wrlock) (Elf *elf, int *change_bop, size_t shnum) we test for the alignment of the section being large enough for the largest alignment required by a data block. */ - if (unlikely (! powerof2 (shdr->sh_addralign)) - || unlikely ((shdr->sh_addralign ?: 1) < sh_align)) + if (shdr->sh_size && (unlikely (! powerof2 (shdr->sh_addralign)) + || unlikely ((shdr->sh_addralign ?: 1) < sh_align))) { __libelf_seterrno (ELF_E_INVALID_ALIGN); return -1; -- 1.8.3.1