Skip to content
This repository was archived by the owner on Mar 22, 2024. It is now read-only.

afl-clang-fast: modify edit_params() to handle '-r' parameters for partial linking #143

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

afl-clang-fast: modify edit_params() to handle '-r' parameters for partial linking #143

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
36 changes: 21 additions & 15 deletions llvm_mode/afl-clang-fast.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ static void find_obj(u8* argv0) {

static void edit_params(u32 argc, char** argv) {

u8 fortify_set = 0, asan_set = 0, x_set = 0, bit_mode = 0;
u8 fortify_set = 0, asan_set = 0, x_set = 0, bit_mode = 0, partial_linking = 0;
u8 *name;

cc_params = ck_alloc((argc + 128) * sizeof(u8*));
Expand Down Expand Up @@ -148,6 +148,10 @@ static void edit_params(u32 argc, char** argv) {
if (!strcmp(cur, "armv7a-linux-androideabi")) bit_mode = 32;
if (!strcmp(cur, "-m64")) bit_mode = 64;

if (!strcmp(cur, "-Wl,-r") ||
!strcmp(cur, "-Wl,-i") ||
!strcmp(cur, "-r")) partial_linking = 1;

if (!strcmp(cur, "-x")) x_set = 1;

if (!strcmp(cur, "-fsanitize=address") ||
Expand Down Expand Up @@ -278,28 +282,30 @@ static void edit_params(u32 argc, char** argv) {
}

#ifndef __ANDROID__
switch (bit_mode) {
if (!partial_linking) {
switch (bit_mode) {

case 0:
cc_params[cc_par_cnt++] = alloc_printf("%s/afl-llvm-rt.o", obj_path);
break;
case 0:
cc_params[cc_par_cnt++] = alloc_printf("%s/afl-llvm-rt.o", obj_path);
break;

case 32:
cc_params[cc_par_cnt++] = alloc_printf("%s/afl-llvm-rt-32.o", obj_path);
case 32:
cc_params[cc_par_cnt++] = alloc_printf("%s/afl-llvm-rt-32.o", obj_path);

if (access(cc_params[cc_par_cnt - 1], R_OK))
FATAL("-m32 is not supported by your compiler");
if (access(cc_params[cc_par_cnt - 1], R_OK))
FATAL("-m32 is not supported by your compiler");

break;
break;

case 64:
cc_params[cc_par_cnt++] = alloc_printf("%s/afl-llvm-rt-64.o", obj_path);
case 64:
cc_params[cc_par_cnt++] = alloc_printf("%s/afl-llvm-rt-64.o", obj_path);

if (access(cc_params[cc_par_cnt - 1], R_OK))
FATAL("-m64 is not supported by your compiler");
if (access(cc_params[cc_par_cnt - 1], R_OK))
FATAL("-m64 is not supported by your compiler");

break;
break;

}
}
#endif

Expand Down