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

refactored kill signal env parsing

Browse Source
This commit is contained in:
Dominik Maier
2021-01-08 11:36:40 +01:00
parent 7eaca9c840
commit 34732e3c5e
5 changed files with 47 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/common.h
View File

@ -56,6 +56,11 @@ extern u8 *doc_path; /* path to documentation dir */
u8 *find_binary(u8 *fname); u8 *find_binary(u8 *fname);
/* Parses the kill signal environment variable, FATALs on error.
If the env is not set, sets the env to default_signal for the signal handlers
and returns the default_signal. */
int parse_afl_kill_signal_env(u8 *afl_kill_signal_env, int default_signal);
/* Read a bitmap from file fname to memory /* Read a bitmap from file fname to memory
This is for the -B option again. */ This is for the -B option again. */

34
src/afl-common.c
View File

@ -424,6 +424,40 @@ u8 *find_binary(u8 *fname) {
} }
/* Parses the kill signal environment variable, FATALs on error.
If the env is not set, sets the env to default_signal for the signal handlers
and returns the default_signal. */
int parse_afl_kill_signal_env(u8 *afl_kill_signal_env, int default_signal) {
if (afl_kill_signal_env && afl_kill_signal_env[0]) {
char *endptr;
u8 signal_code;
signal_code = (u8)strtoul(afl_kill_signal_env, &endptr, 10);
/* Did we manage to parse the full string? */
if (*endptr != '\0' || endptr == (char *)afl_kill_signal_env) {
FATAL("Invalid AFL_KILL_SIGNAL: %s (expected unsigned int)",
afl_kill_signal_env);
}
return signal_code;
} else {
char *sigstr = alloc_printf("%d", default_signal);
if (!sigstr) { FATAL("Failed to alloc mem for signal buf"); }
/* Set the env for signal handler */
setenv("AFL_KILL_SIGNAL", sigstr, 1);
free(sigstr);
return default_signal;
}
}
void check_environment_vars(char **envp) { void check_environment_vars(char **envp) {
if (be_quiet) { return; } if (be_quiet) { return; }

32
src/afl-fuzz.c
View File

@ -76,9 +76,9 @@ static void at_exit() {
} }
u8 kill_signal = SIGKILL; int kill_signal = SIGKILL;
/* AFL_KILL_SIGNAL should already be initialized by afl_fsrv_init() */ /* AFL_KILL_SIGNAL should already be a valid int at this point */
if (getenv("AFL_KILL_SIGNAL")) { if (getenv("AFL_KILL_SIGNAL")) {
kill_signal = atoi(getenv("AFL_KILL_SIGNAL")); kill_signal = atoi(getenv("AFL_KILL_SIGNAL"));
@ -987,32 +987,8 @@ int main(int argc, char **argv_orig, char **envp) {
#endif #endif
afl->fsrv.kill_signal = SIGKILL; afl->fsrv.kill_signal =
if (afl->afl_env.afl_kill_signal) { parse_afl_kill_signal_env(afl->afl_env.afl_kill_signal, SIGKILL);
char *endptr;
u8 signal_code;
signal_code = (u8)strtoul(afl->afl_env.afl_kill_signal, &endptr, 10);
/* Did we manage to parse the full string? */
if (*endptr != '\0' || endptr == (char *)afl->afl_env.afl_kill_signal) {
FATAL("Invalid AFL_KILL_SIGNAL: %s (expected unsigned int)",
afl->afl_env.afl_kill_signal);
}
afl->fsrv.kill_signal = signal_code;
} else {
char *sigstr = alloc_printf("%d", (int)SIGKILL);
if (!sigstr) { FATAL("Failed to alloc mem for signal buf"); }
/* Set the env for signal handler */
setenv("AFL_KILL_SIGNAL", sigstr, 1);
free(sigstr);
}
setup_signal_handlers(); setup_signal_handlers();
check_asan_opts(afl); check_asan_opts(afl);

29
src/afl-showmap.c
View File

@ -1116,33 +1116,8 @@ int main(int argc, char **argv_orig, char **envp) {
} }
fsrv->kill_signal = SIGKILL; fsrv->kill_signal =
char *afl_kill_signal_env = getenv("AFL_KILL_SIGNAL"); parse_afl_kill_signal_env(getenv("AFL_KILL_SIGNAL"), SIGKILL);
if (afl_kill_signal_env && afl_kill_signal_env[0]) {
char *endptr;
u8 signal_code;
signal_code = (u8)strtoul(afl_kill_signal_env, &endptr, 10);
/* Did we manage to parse the full string? */
if (*endptr != '\0' || endptr == afl_kill_signal_env) {
FATAL("Invalid AFL_KILL_SIGNAL: %s (expected unsigned int)",
afl_kill_signal_env);
}
fsrv->kill_signal = signal_code;
} else {
char *sigstr = alloc_printf("%d", (int)SIGKILL);
if (!sigstr) { FATAL("Failed to alloc mem for signal buf"); }
/* Set the env for signal handler */
setenv("AFL_KILL_SIGNAL", sigstr, 1);
free(sigstr);
}
if (getenv("AFL_CRASH_EXITCODE")) { if (getenv("AFL_CRASH_EXITCODE")) {

29
src/afl-tmin.c
View File

@ -1135,33 +1135,8 @@ int main(int argc, char **argv_orig, char **envp) {
} }
fsrv->kill_signal = SIGKILL; fsrv->kill_signal =
char *afl_kill_signal_env = getenv("AFL_KILL_SIGNAL"); parse_afl_kill_signal_env(getenv("AFL_KILL_SIGNAL"), SIGKILL);
if (afl_kill_signal_env && afl_kill_signal_env[0]) {
char *endptr;
u8 signal_code;
signal_code = (u8)strtoul(afl_kill_signal_env, &endptr, 10);
/* Did we manage to parse the full string? */
if (*endptr != '\0' || endptr == afl_kill_signal_env) {
FATAL("Invalid AFL_KILL_SIGNAL: %s (expected unsigned int)",
afl_kill_signal_env);
}
fsrv->kill_signal = signal_code;
} else {
char *sigstr = alloc_printf("%d", (int)SIGKILL);
if (!sigstr) { FATAL("Failed to alloc mem for signal buf"); }
/* Set the env for signal handler */
setenv("AFL_KILL_SIGNAL", sigstr, 1);
free(sigstr);
}
if (getenv("AFL_CRASH_EXITCODE")) { if (getenv("AFL_CRASH_EXITCODE")) {