ExternalVendorCode/AFLplusplus
1
0
Fork 0
mirror of https://github.com/AFLplusplus/AFLplusplus.git synced 2025-06-12 18:18:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #817 from realmadsci/atat-plusplus

Browse Source 
Make @@ handling more flexible
This commit is contained in:
van Hauser
2021-03-24 11:26:10 +01:00
committed by GitHub
parent ee5078f43c d17abce59b
commit 7dc4847869
4 changed files with 35 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
afl-cmin
View File

@ -243,7 +243,7 @@ BEGIN {
if (!stdin_file) { if (!stdin_file) {
found_atat = 0 found_atat = 0
for (prog_args_ind in prog_args) { for (prog_args_ind in prog_args) {
if ("@@" == prog_args[prog_args_ind]) { if (match(prog_args[prog_args_ind], "@@") != 0) {
found_atat = 1 found_atat = 1
break break
} }

27
src/afl-common.c
View File

@ -70,31 +70,26 @@ void detect_file_args(char **argv, u8 *prog_in, bool *use_stdin) {
*use_stdin = false; *use_stdin = false;
if (prog_in[0] != 0) { // not afl-showmap special case /* Be sure that we're always using fully-qualified paths. */
u8 *n_arg; *aa_loc = 0;
/* Be sure that we're always using fully-qualified paths. */ /* Construct a replacement argv value. */
u8 *n_arg;
*aa_loc = 0; if (prog_in[0] == '/') {
/* Construct a replacement argv value. */ n_arg = alloc_printf("%s%s%s", argv[i], prog_in, aa_loc + 2);
if (prog_in[0] == '/') { } else {
n_arg = alloc_printf("%s%s%s", argv[i], prog_in, aa_loc + 2); n_arg = alloc_printf("%s%s/%s%s", argv[i], cwd, prog_in, aa_loc + 2);
} else {
n_arg = alloc_printf("%s%s/%s%s", argv[i], cwd, prog_in, aa_loc + 2);
}
ck_free(argv[i]);
argv[i] = n_arg;
} }
ck_free(argv[i]);
argv[i] = n_arg;
} }
i++; i++;

50
src/afl-showmap.c
View File

@ -72,8 +72,7 @@ static u8 *in_data, /* Input data */
static u64 total; /* tuple content information */ static u64 total; /* tuple content information */
static u32 tcnt, highest; /* tuple content information */ static u32 tcnt, highest; /* tuple content information */
static u32 in_len, /* Input data length */ static u32 in_len; /* Input data length */
arg_offset; /* Total number of execs */
static u32 map_size = MAP_SIZE; static u32 map_size = MAP_SIZE;
@ -956,12 +955,30 @@ int main(int argc, char **argv_orig, char **envp) {
} }
if (in_dir) { if (in_dir) {
detect_file_args(argv + optind, "", &fsrv->use_stdin); /* If we don't have a file name chosen yet, use a safe default. */
u8 *use_dir = ".";
if (access(use_dir, R_OK | W_OK | X_OK)) {
use_dir = get_afl_env("TMPDIR");
if (!use_dir) { use_dir = "/tmp"; }
}
stdin_file = at_file ? strdup(at_file)
: (char *)alloc_printf("%s/.afl-showmap-temp-%u",
use_dir, (u32)getpid());
unlink(stdin_file);
// If @@ are in the target args, replace them and also set use_stdin=false.
detect_file_args(argv + optind, stdin_file, &fsrv->use_stdin);
} else { } else {
// If @@ are in the target args, replace them and also set use_stdin=false.
detect_file_args(argv + optind, at_file, &fsrv->use_stdin); detect_file_args(argv + optind, at_file, &fsrv->use_stdin);
} }
@ -986,14 +1003,6 @@ int main(int argc, char **argv_orig, char **envp) {
} }
i = 0;
while (use_argv[i] != NULL && !arg_offset) {
if (strcmp(use_argv[i], "@@") == 0) { arg_offset = i; }
i++;
}
shm_fuzz = ck_alloc(sizeof(sharedmem_t)); shm_fuzz = ck_alloc(sizeof(sharedmem_t));
/* initialize cmplog_mode */ /* initialize cmplog_mode */
@ -1104,31 +1113,12 @@ int main(int argc, char **argv_orig, char **envp) {
} }
u8 *use_dir = ".";
if (access(use_dir, R_OK | W_OK | X_OK)) {
use_dir = get_afl_env("TMPDIR");
if (!use_dir) { use_dir = "/tmp"; }
}
stdin_file = at_file ? strdup(at_file)
: (char *)alloc_printf("%s/.afl-showmap-temp-%u",
use_dir, (u32)getpid());
unlink(stdin_file);
atexit(at_exit_handler); atexit(at_exit_handler);
fsrv->out_file = stdin_file; fsrv->out_file = stdin_file;
fsrv->out_fd = fsrv->out_fd =
open(stdin_file, O_RDWR | O_CREAT | O_EXCL, DEFAULT_PERMISSION); open(stdin_file, O_RDWR | O_CREAT | O_EXCL, DEFAULT_PERMISSION);
if (fsrv->out_fd < 0) { PFATAL("Unable to create '%s'", out_file); } if (fsrv->out_fd < 0) { PFATAL("Unable to create '%s'", out_file); }
if (arg_offset && use_argv[arg_offset] != stdin_file) {
use_argv[arg_offset] = strdup(stdin_file);
}
if (get_afl_env("AFL_DEBUG")) { if (get_afl_env("AFL_DEBUG")) {
int j = optind; int j = optind;

5
utils/crash_triage/triage_crashes.sh
View File

@ -90,8 +90,9 @@ for crash in $DIR/crashes/id:*; do
for a in $@; do for a in $@; do
if [ "$a" = "@@" ] ; then if echo "$a" | grep -qF '@@'; then
use_args="$use_args $crash" escaped_fname=`echo $crash | sed 's:/:\\\\/:g'`
use_args="$use_args `echo $a | sed "s/@@/$escaped_fname/g"`"
unset use_stdio unset use_stdio
else else
use_args="$use_args $a" use_args="$use_args $a"