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

Move OS-dependent mprotect for module loading to grub-core/osdep/*/dl.c

Browse source 
and implement windows variant.
This commit is contained in:
Vladimir Serbinenko 2013-12-08 18:07:41 +01:00
parent d5c14e1e26
commit a19293cb75
7 changed files with 147 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

20
grub-core/kern/dl.c
View file

@ -38,10 +38,6 @@
#define GRUB_MODULES_MACHINE_READONLY
#endif
#ifdef GRUB_MACHINE_EMU
#include <sys/mman.h>
#endif
#pragma GCC diagnostic ignored "-Wcast-align"
@ -258,21 +254,15 @@ grub_dl_load_segments (grub_dl_t mod, const Elf_Ehdr *e)
#endif
#ifdef GRUB_MACHINE_EMU
if (talign < 8192 * 16)
talign = 8192 * 16;
tsize = ALIGN_UP (tsize, 8192 * 16);
#endif
mod->base = grub_osdep_dl_memalign (talign, tsize);
#else
mod->base = grub_memalign (talign, tsize);
#endif
if (!mod->base)
return grub_errno;
mod->sz = tsize;
ptr = mod->base;
#ifdef GRUB_MACHINE_EMU
mprotect (mod->base, tsize, PROT_READ | PROT_WRITE | PROT_EXEC);
#endif
for (i = 0, s = (Elf_Shdr *)((char *) e + e->e_shoff);
i < e->e_shnum;
i++, s = (Elf_Shdr *)((char *) s + e->e_shentsize))
@ -782,7 +772,11 @@ grub_dl_unload (grub_dl_t mod)
grub_free (dep);
}
#ifdef GRUB_MACHINE_EMU
grub_dl_osdep_dl_free (mod->base);
#else
grub_free (mod->base);
#endif
grub_free (mod->name);
#ifdef GRUB_MODULES_MACHINE_READONLY
grub_free (mod->symtab);