From 4f4ea1b4496375e3a3315d6db28612179be5bf73 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 9 Dec 2013 14:22:31 +0100 Subject: [PATCH] * grub-core/kern/ia64/dl_helper.c (grub_ia64_dl_get_tramp_got_size): Do not explicitly check for symbol table as it's already checked in platform-independent layer. --- ChangeLog | 6 ++++++ grub-core/kern/ia64/dl_helper.c | 12 +----------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 548423652..9ce084d58 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2013-12-09 Vladimir Serbinenko + + * grub-core/kern/ia64/dl_helper.c (grub_ia64_dl_get_tramp_got_size): + Do not explicitly check for symbol table as it's already checked in + platform-independent layer. + 2013-12-09 Colin Watson * util/grub-mkconfig.in: Add missing newline to output. diff --git a/grub-core/kern/ia64/dl_helper.c b/grub-core/kern/ia64/dl_helper.c index 0bebe60e0..c7e53a679 100644 --- a/grub-core/kern/ia64/dl_helper.c +++ b/grub-core/kern/ia64/dl_helper.c @@ -173,20 +173,10 @@ grub_ia64_dl_get_tramp_got_size (const void *ehdr, grub_size_t *tramp, grub_size_t *got) { const Elf64_Ehdr *e = ehdr; - grub_size_t cntt = 0, cntg = 0;; + grub_size_t cntt = 0, cntg = 0; const Elf64_Shdr *s; unsigned i; - /* Find a symbol table. */ - for (i = 0, s = (Elf64_Shdr *) ((char *) e + grub_le_to_cpu64 (e->e_shoff)); - i < grub_le_to_cpu16 (e->e_shnum); - i++, s = (Elf64_Shdr *) ((char *) s + grub_le_to_cpu16 (e->e_shentsize))) - if (s->sh_type == grub_cpu_to_le32_compile_time (SHT_SYMTAB)) - break; - - if (i == grub_le_to_cpu16 (e->e_shnum)) - return GRUB_ERR_NONE; - for (i = 0, s = (Elf64_Shdr *) ((char *) e + grub_le_to_cpu64 (e->e_shoff)); i < grub_le_to_cpu16 (e->e_shnum); i++, s = (Elf64_Shdr *) ((char *) s + grub_le_to_cpu16 (e->e_shentsize)))