proxmox-mirrors/grub2
1
0
Fork 0
mirror of https://git.proxmox.com/git/grub2 synced 2025-05-18 15:29:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix handling of >32K relocations

Browse Source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2009-12-02 21:01:02 +01:00
parent d065a04ae4
commit f0299c60d4
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
kern/mips/dl.c
View File

@ -162,18 +162,23 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
case R_MIPS_HI16: case R_MIPS_HI16:
{ {
grub_uint32_t value; grub_uint32_t value;
Elf_Rel *rel2;
/* Handle partner lo16 relocation. Lower part is /* Handle partner lo16 relocation. Lower part is
treated as signed. Hence add 0x8000 to compensate. treated as signed. Hence add 0x8000 to compensate.
*/ */
value = (*(grub_uint16_t *) addr << 16) value = (*(grub_uint16_t *) addr << 16)
+ sym->st_value + 0x8000; + sym->st_value + 0x8000;
if (rel + 1 < max && ELF_R_SYM (rel[1].r_info) for (rel2 = rel + 1; rel2 < max; rel2++)
== ELF_R_SYM (rel[0].r_info) if (ELF_R_SYM (rel2->r_info)
&& ELF_R_TYPE (rel[1].r_info) == R_MIPS_LO16) == ELF_R_SYM (rel->r_info)
value += *(grub_uint16_t *) && ELF_R_TYPE (rel2->r_info) == R_MIPS_LO16)
((char *) seg->addr + rel[1].r_offset); {
*(grub_uint16_t *) addr += (value >> 16) & 0xffff; value += *(grub_int16_t *)
((char *) seg->addr + rel2->r_offset);
break;
}
*(grub_uint16_t *) addr = (value >> 16) & 0xffff;
} }
break; break;
case R_MIPS_LO16: case R_MIPS_LO16: