openharmony/third_party_elfutils
1
0
Fork 0
mirror of https://github.com/openharmony/third_party_elfutils.git synced 2026-07-18 17:24:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

libelf: Check e_shoff alignment before direct access of Elf(32|64)_Shdr.

Browse Source 
In get_shnum the check was whether the Elf(32|64)_Ehdr was correctly
aligned, but to access the Shdr directly we need to check whether the
address that points to the Elf(32|64)_Shdr structure is correctly aligned.

Signed-off-by: Mark Wielaard <mjw@redhat.com>
This commit is contained in:
Mark Wielaard
2015-06-04 13:51:27 +02:00
parent b9fd0eee50
commit 560aa98b9a
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libelf/ChangeLog
+5
View File
@@ -1,3 +1,8 @@
2015-06-04 Mark Wielaard <mjw@redhat.com>
* elf_begin.c (get_shnum): Check alignment of Shdr, not Ehdr before
direct access.
2015-06-02 Mark Wielaard <mjw@redhat.com>
* elf_begin.c (file_read_elf): Split checks for ehdr and shdr
libelf/elf_begin.c
+4 -4
View File
@@ -151,8 +151,8 @@ get_shnum (void *map_address, unsigned char *e_ident, int fildes, off_t offset,
if (likely (map_address != NULL) && e_ident[EI_DATA] == MY_ELFDATA
&& (ALLOW_UNALIGNED
|| (((size_t) ((char *) map_address + offset))
& (__alignof__ (Elf32_Ehdr) - 1)) == 0))
|| (((size_t) ((char *) map_address + ehdr.e32->e_shoff))
& (__alignof__ (Elf32_Shdr) - 1)) == 0))
/* We can directly access the memory. */
result = ((Elf32_Shdr *) ((char *) map_address + ehdr.e32->e_shoff
+ offset))->sh_size;
@@ -201,8 +201,8 @@ get_shnum (void *map_address, unsigned char *e_ident, int fildes, off_t offset,
Elf64_Xword size;
if (likely (map_address != NULL) && e_ident[EI_DATA] == MY_ELFDATA
&& (ALLOW_UNALIGNED
|| (((size_t) ((char *) map_address + offset))
& (__alignof__ (Elf64_Ehdr) - 1)) == 0))
|| (((size_t) ((char *) map_address + ehdr.e64->e_shoff))
& (__alignof__ (Elf64_Shdr) - 1)) == 0))
/* We can directly access the memory. */
size = ((Elf64_Shdr *) ((char *) map_address + ehdr.e64->e_shoff
+ offset))->sh_size;