vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* grub-core/kern/ia64/dl_helper.c (grub_ia64_dl_get_tramp_got_size):

Browse source 
Do not explicitly check for symbol table as it's already checked in
	platform-independent layer.
This commit is contained in:
Vladimir Serbinenko 2013-12-09 14:22:31 +01:00
parent fe4ae21331
commit 4f4ea1b449
2 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2013-12-09 Vladimir Serbinenko <phcoder@gmail.com>
* 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 <cjwatson@ubuntu.com> 2013-12-09 Colin Watson <cjwatson@ubuntu.com>
* util/grub-mkconfig.in: Add missing newline to output. * util/grub-mkconfig.in: Add missing newline to output.

12
grub-core/kern/ia64/dl_helper.c
View file

@ -173,20 +173,10 @@ grub_ia64_dl_get_tramp_got_size (const void *ehdr, grub_size_t *tramp,
grub_size_t *got) grub_size_t *got)
{ {
const Elf64_Ehdr *e = ehdr; const Elf64_Ehdr *e = ehdr;
grub_size_t cntt = 0, cntg = 0;; grub_size_t cntt = 0, cntg = 0;
const Elf64_Shdr *s; const Elf64_Shdr *s;
unsigned i; 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)); for (i = 0, s = (Elf64_Shdr *) ((char *) e + grub_le_to_cpu64 (e->e_shoff));
i < grub_le_to_cpu16 (e->e_shnum); i < grub_le_to_cpu16 (e->e_shnum);
i++, s = (Elf64_Shdr *) ((char *) s + grub_le_to_cpu16 (e->e_shentsize))) i++, s = (Elf64_Shdr *) ((char *) s + grub_le_to_cpu16 (e->e_shentsize)))