d0p1/tcc-stupidos
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Align next section after gnu_ro to pagesize

Browse source 
To allow remapping the ro section the next section must start
on a new page.
This commit is contained in:
herman ten brugge 2021-01-02 15:17:25 +01:00
parent b147a37c23
commit 3221cc4a5a
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tccelf.c
View file

@ -47,6 +47,10 @@ struct sym_version {
/* section is dynsymtab_section */ /* section is dynsymtab_section */
#define SHF_DYNSYM 0x40000000 #define SHF_DYNSYM 0x40000000
#ifndef PAGESIZE
# define PAGESIZE 4096
#endif
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
ST_FUNC void tccelf_new(TCCState *s) ST_FUNC void tccelf_new(TCCState *s)
@ -1871,7 +1875,7 @@ static int layout_sections(TCCState *s1, ElfW(Phdr) *phdr,
long long tmp; long long tmp;
addr_t addr; addr_t addr;
ElfW(Phdr) *ph; ElfW(Phdr) *ph;
int j, k, file_type = s1->output_type; int j, k, f, file_type = s1->output_type;
s_align = ELF_PAGE_SIZE; s_align = ELF_PAGE_SIZE;
if (s1->section_align) if (s1->section_align)
@ -1924,6 +1928,7 @@ static int layout_sections(TCCState *s1, ElfW(Phdr) *phdr,
info about the layout. We do the following ordering: interp, info about the layout. We do the following ordering: interp,
symbol tables, relocations, progbits, nobits */ symbol tables, relocations, progbits, nobits */
/* XXX: do faster and simpler sorting */ /* XXX: do faster and simpler sorting */
f = -1;
for(k = 0; k < 7; k++) { for(k = 0; k < 7; k++) {
for(i = 1; i < s1->nb_sections; i++) { for(i = 1; i < s1->nb_sections; i++) {
s = s1->sections[i]; s = s1->sections[i];
@ -1966,6 +1971,9 @@ static int layout_sections(TCCState *s1, ElfW(Phdr) *phdr,
0) { 0) {
if (k != 4) if (k != 4)
continue; continue;
/* Align next section on page size.
This is needed to remap roinf section ro. */
f = 1;
} else { } else {
if (k != 5) if (k != 5)
continue; continue;
@ -1974,6 +1982,8 @@ static int layout_sections(TCCState *s1, ElfW(Phdr) *phdr,
/* section matches: we align it and add its size */ /* section matches: we align it and add its size */
tmp = addr; tmp = addr;
if (f-- == 0)
s->sh_addralign = PAGESIZE;
addr = (addr + s->sh_addralign - 1) & addr = (addr + s->sh_addralign - 1) &
~(s->sh_addralign - 1); ~(s->sh_addralign - 1);
file_offset += (int) ( addr - tmp ); file_offset += (int) ( addr - tmp );