Skip to content

Fix build on Ubuntu 20,22 and ARM64 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
amalone-scwx wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix build on Ubuntu 20,22 and ARM64 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions src/fuzz_dyn.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ int dyn8(void)

#if defined(__i386__)
Elf_Word d_val;
#elif defined(__x86_64__)
#elif defined(__x86_64__) || defined(__aarch64__)
Elf_Xword d_val;
#endif

Expand Down Expand Up @@ -268,7 +268,7 @@ int dyn11(void)

#if defined(__i386__)
orcDYN->d_un.d_val = DT_RELA;
#elif defined(__x86_64__)
#elif defined(__x86_64__) || defined(__aarch64__)
orcDYN->d_un.d_val = DT_REL;
#endif

Expand Down Expand Up @@ -316,7 +316,7 @@ int dyn13(void)

#if defined(__i386__)
Elf_Sword d_tag;
#elif defined(__x86_64__)
#elif defined(__x86_64__) || defined(__aarch64__)
Elf_Sxword d_tag;
#endif

Expand All @@ -327,7 +327,7 @@ int dyn13(void)
} else
#if defined(__i386__)
d_tag = getElf_Word();
#elif defined(__x86_64__)
#elif defined(__x86_64__) || defined(__aarch64__)
d_tag = getElf_Xword();
#endif

Expand All @@ -351,7 +351,7 @@ int dyn14(void)

#if defined(__i386__)
Elf_Sword d_tag;
#elif defined(__x86_64__)
#elif defined(__x86_64__) || defined(__aarch64__)
Elf_Sxword d_tag;
#endif

Expand All @@ -365,7 +365,7 @@ int dyn14(void)
} else
#if defined(__i386__)
d_tag = getElf_Word();
#elif defined(__x86_64__)
#elif defined(__x86_64__) || defined(__aarch64__)
d_tag = getElf_Xword();
#endif

Expand All @@ -386,7 +386,7 @@ int dyn15(void)

#if defined(__i386__)
Elf_Sword d_tag;
#elif defined(__x86_64__)
#elif defined(__x86_64__) || defined(__aarch64__)
Elf_Sxword d_tag;
#endif

Expand All @@ -397,7 +397,7 @@ int dyn15(void)
} else
#if defined(__i386__)
d_tag = getElf_Word();
#elif defined(__x86_64__)
#elif defined(__x86_64__) || defined(__aarch64__)
d_tag = getElf_Xword();
#endif

Expand Down Expand Up @@ -461,7 +461,7 @@ int dyn17(void)

#if defined(__i386__)
Elf_Word d_val;
#elif defined(__x86_64__)
#elif defined(__x86_64__) || defined(__aarch64__)
Elf_Xword d_val;
#endif

Expand All @@ -474,7 +474,7 @@ int dyn17(void)

#if defined(__i386__)
d_val += 8; // A ptr in 64-bit is 8 bytes. Add 8 to 32-bit ELF
#elif defined(__x86_64__)
#elif defined(__x86_64__) || defined(__aarch64__)
d_val += 4; // Vice versa
#endif
}
Expand All @@ -493,7 +493,7 @@ int dyn18(void)

// d_tag is a Sword (Signed Word)
if(rand() % 2){ // 50% chance to set d_tag to a negative number > 0x7fffffff
#if defined(__x86_64__)
#if defined(__x86_64__) || defined(__aarch64__)
if(rand() % 2)
orcDYN->d_tag = 0x8000000000000000 + (rand() % 0x7fffffff);
else
Expand Down
40 changes: 20 additions & 20 deletions src/fuzz_pht.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ int pht4(void)

#if defined(__i386__)
Elf_Word p_memsz;
#elif defined(__x86_64__)
#elif defined(__x86_64__) || defined(__aarch64__)
Elf_Xword p_memsz;
#endif
int r = rand();
Expand All @@ -213,7 +213,7 @@ int pht4(void)
orcPHT->p_filesz = 0;
#if defined(__i386__)
while((p_memsz = getElf_Word()))
#elif defined(__x86_64__)
#elif defined(__x86_64__) || defined(__aarch64__)
while((p_memsz = getElf_Xword()))
#endif
if(p_memsz % PAGESIZE == 0){
Expand All @@ -223,7 +223,7 @@ int pht4(void)
} else if(r % 3 == 1){
#if defined(__i386__)
orcPHT->p_filesz = getElf_Word();
#elif defined(__x86_64__)
#elif defined(__x86_64__) || defined(__aarch64__)
orcPHT->p_filesz = getElf_Xword();
#endif
orcPHT->p_memsz = 0;
Expand Down Expand Up @@ -251,7 +251,7 @@ int pht5(void)
} else
#if defined(__i386__)
orcPHT->p_align = getElf_Word();
#elif defined(__x86_64__)
#elif defined(__x86_64__) || defined(__aarch64__)
orcPHT->p_align = getElf_Xword();
#endif

Expand Down Expand Up @@ -305,14 +305,14 @@ int pht7(void)

#if defined(__i386__)
Elf_Word p_filesz;
#elif defined(__x86_64__)
#elif defined(__x86_64__) || defined(__aarch64__)
Elf_Xword p_filesz;
#endif

if(rand() % 3 < 2){
#if defined(__i386__)
while((p_filesz = getElf_Word()))
#elif defined(__x86_64__)
#elif defined(__x86_64__) || defined(__aarch64__)
while((p_filesz = getElf_Xword()))
#endif
if(p_filesz >= orcPHT->p_memsz){
Expand All @@ -322,7 +322,7 @@ int pht7(void)
} else
#if defined(__i386__)
orcPHT->p_filesz = getElf_Word();
#elif defined(__x86_64__)
#elif defined(__x86_64__) || defined(__aarch64__)
orcPHT->p_filesz = getElf_Xword();
#endif

Expand All @@ -341,7 +341,7 @@ int pht8(void)

#if defined(__i386__)
Elf_Word p_filesz;
#elif defined(__x86_64__)
#elif defined(__x86_64__) || defined(__aarch64__)
Elf_Xword p_filesz;
#endif

Expand Down Expand Up @@ -537,18 +537,18 @@ int pht16(void)
orcPHT->p_vaddr = getElf_Addr();
#if defined(__i386__)
orcPHT->p_filesz = getElf_Word();
#elif defined(__x86_64__)
#elif defined(__x86_64__) || defined(__aarch64__)
orcPHT->p_filesz = getElf_Xword();
#endif
#if defined(__i386__)
orcPHT->p_memsz = getElf_Word();
#elif defined(__x86_64__)
#elif defined(__x86_64__) || defined(__aarch64__)
orcPHT->p_memsz = getElf_Xword();
#endif
orcPHT->p_flags = getElf_Word();
#if defined(__i386__)
orcPHT->p_align = getElf_Word();
#elif defined(__x86_64__)
#elif defined(__x86_64__) || defined(__aarch64__)
orcPHT->p_align = getElf_Xword();
#endif

Expand All @@ -572,18 +572,18 @@ int pht17(void)
orcPHT->p_vaddr = getElf_Addr();
#if defined(__i386__)
orcPHT->p_filesz = getElf_Word();
#elif defined(__x86_64__)
#elif defined(__x86_64__) || defined(__aarch64__)
orcPHT->p_filesz = getElf_Xword();
#endif
#if defined(__i386__)
orcPHT->p_memsz = getElf_Word();
#elif defined(__x86_64__)
#elif defined(__x86_64__) || defined(__aarch64__)
orcPHT->p_memsz = getElf_Xword();
#endif
orcPHT->p_flags = getElf_Word();
#if defined(__i386__)
orcPHT->p_align = getElf_Word();
#elif defined(__x86_64__)
#elif defined(__x86_64__) || defined(__aarch64__)
orcPHT->p_align = getElf_Xword();
#endif

Expand All @@ -607,18 +607,18 @@ int pht18(void)
orcPHT->p_vaddr = getElf_Addr();
#if defined(__i386__)
orcPHT->p_filesz = getElf_Word();
#elif defined(__x86_64__)
#elif defined(__x86_64__) || defined(__aarch64__)
orcPHT->p_filesz = getElf_Xword();
#endif
#if defined(__i386__)
orcPHT->p_memsz = getElf_Word();
#elif defined(__x86_64__)
#elif defined(__x86_64__) || defined(__aarch64__)
orcPHT->p_memsz = getElf_Xword();
#endif
orcPHT->p_flags = getElf_Word();
#if defined(__i386__)
orcPHT->p_align = getElf_Word();
#elif defined(__x86_64__)
#elif defined(__x86_64__) || defined(__aarch64__)
orcPHT->p_align = getElf_Xword();
#endif

Expand Down Expand Up @@ -768,18 +768,18 @@ int pht22(void)
tmpPHT->p_vaddr = getElf_Addr();
#if defined(__i386__)
tmpPHT->p_filesz = getElf_Word();
#elif defined(__x86_64__)
#elif defined(__x86_64__) || defined(__aarch64__)
tmpPHT->p_filesz = getElf_Xword();
#endif
#if defined(__i386__)
tmpPHT->p_memsz = getElf_Word();
#elif defined(__x86_64__)
#elif defined(__x86_64__) || defined(__aarch64__)
tmpPHT->p_memsz = getElf_Xword();
#endif
tmpPHT->p_flags = getElf_Word();
#if defined(__i386__)
tmpPHT->p_align = getElf_Word();
#elif defined(__x86_64__)
#elif defined(__x86_64__) || defined(__aarch64__)
tmpPHT->p_align = getElf_Xword();
#endif

Expand Down
6 changes: 3 additions & 3 deletions src/fuzz_rel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,13 @@ int rel2(void)
if(orcSHT->sh_type == SHT_REL)
#if defined(__i386__)
orcREL->r_info = getElf_Word();
#elif defined(__x86_64__)
#elif defined(__x86_64__) || defined(__aarch64__)
orcREL->r_info = getElf_Xword();
#endif
else
#if defined(__i386__)
orcRELA->r_info = getElf_Word();
#elif defined(__x86_64__)
#elif defined(__x86_64__) || defined(__aarch64__)
orcRELA->r_info = getElf_Xword();
#endif
}
Expand All @@ -108,7 +108,7 @@ int rel3(void)

// r_addend is a Sword (Signed Word)
if(rand() % 2){ // 75% chance to set r_addend to a negative number > 0x7fffffff
#if defined(__x86_64__)
#if defined(__x86_64__) || defined(__aarch64__)
if(rand() % 2)
orcRELA->r_addend = 0x8000000000000000 + (rand() % 0x7fffffff);
else
Expand Down
12 changes: 6 additions & 6 deletions src/fuzz_sht.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -751,7 +751,7 @@ int sht20(void)

#if defined(__i386__)
Elf_Word s;
#elif defined(__x86_64__)
#elif defined(__x86_64__) || defined(__aarch64__)
Elf_Xword s;
#endif

Expand All @@ -760,7 +760,7 @@ int sht20(void)
if(r % 3 == 0) // If running in 64 bits, set a size modulo the 32-bits struct's size and viceversa
#if defined(__i386__)
s = sizeof(Elf64_Nhdr);
#elif defined(__x86_64__)
#elif defined(__x86_64__) || defined(__aarch64__)
s = sizeof(Elf32_Nhdr);
#endif
else if(r % 3 == 1){
Expand Down Expand Up @@ -1483,7 +1483,7 @@ void fuzzSize()
if(rand() % 2)
#if defined(__i386__)
orcSHT->sh_size = getElf_Word();
#elif defined(__x86_64__)
#elif defined(__x86_64__) || defined(__aarch64__)
orcSHT->sh_size = getElf_Xword();
#endif
else
Expand All @@ -1498,7 +1498,7 @@ void fuzzEntSize()
if(rand() % 2)
#if defined(__i386__)
orcSHT->sh_entsize = getElf_Word();
#elif defined(__x86_64__)
#elif defined(__x86_64__) || defined(__aarch64__)
orcSHT->sh_entsize = getElf_Xword();
else
orcSHT->sh_entsize = getElf_Half();
Expand Down Expand Up @@ -1542,7 +1542,7 @@ void fuzzFlags()
} else {
#if defined(__i386__)
orcSHT->sh_flags = getElf_Word();
#elif defined(__x86_64__)
#elif defined(__x86_64__) || defined(__aarch64__)
orcSHT->sh_flags = getElf_Xword();
#endif
}
Expand All @@ -1553,7 +1553,7 @@ void fuzzAddrAlign()
if(rand() % 2){ // 50% chance
#if defined(__i386__)
while((orcSHT->sh_addralign = getElf_Word()))
#elif defined(__x86_64__)
#elif defined(__x86_64__) || defined(__aarch64__)
while((orcSHT->sh_addralign = getElf_Xword()))
#endif
// Bitwise: x & (x - 1) != 0 if x is NOT a power of 2
Expand Down
1 change: 1 addition & 0 deletions src/melkor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ Elf_Off elfshstrtab_offset = 0, orcshstrtab_offset = 0, linkstrtab_offset = 0;
Elf_Shdr *orcOrigSHT;
Elf_Phdr *orcOrigPHT;
Elf_Dyn *elfOrigDYN;
int PAGESIZE;

extern int errno;

Expand Down
4 changes: 2 additions & 2 deletions src/melkor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
*/
typedef int (*func_ptr)(void);

int PAGESIZE; // Set at runtime with getpagesize() in melkor.c
extern int PAGESIZE; // Set at runtime with getpagesize() in melkor.c

#ifndef PT_GNU_STACK
#define PT_GNU_STACK 0x6474e551 // Indicates executable stack
Expand Down Expand Up @@ -112,7 +112,7 @@ int PAGESIZE; // Set at runtime with getpagesize() in melkor.c

#define HEX "%.8x"

#elif defined(__x86_64__) /**** x86_64 ****/
#elif defined(__x86_64__) || defined(__aarch64__) /**** x86_64 ****/
// Data Types
#define Elf_Half Elf64_Half
#define Elf_Word Elf64_Word
Expand Down