Skip to content

Commit d714ccf

Browse files
committed
add crash exit request.
call crash exit request on crashing signal in usermode.
1 parent a86bd6b commit d714ccf

File tree

3 files changed

+25
-5
lines changed

3 files changed

+25
-5
lines changed

include/libafl/exit.h

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ enum libafl_exit_reason_kind {
1414
INTERNAL = 0,
1515
BREAKPOINT = 1,
1616
CUSTOM_INSN = 2,
17-
TIMEOUT = 3,
17+
CRASH = 3,
18+
TIMEOUT = 4,
1819
};
1920

2021
enum libafl_custom_insn_kind {
@@ -39,6 +40,10 @@ struct libafl_exit_reason_custom_insn {
3940
enum libafl_custom_insn_kind kind;
4041
};
4142

43+
// A timeout occured and we were asked to exit on timeout
44+
struct libafl_exit_reason_crash {
45+
};
46+
4247
// A timeout occured and we were asked to exit on timeout
4348
struct libafl_exit_reason_timeout {
4449
};
@@ -52,6 +57,7 @@ struct libafl_exit_reason {
5257
struct libafl_exit_reason_breakpoint breakpoint; // kind == BREAKPOINT
5358
struct libafl_exit_reason_custom_insn
5459
custom_insn; // kind == CUSTOM_INSN
60+
struct libafl_exit_reason_crash crash; // kind == CRASH
5561
struct libafl_exit_reason_timeout timeout; // kind == TIMEOUT
5662
} data;
5763
};
@@ -74,9 +80,7 @@ void libafl_exit_request_internal(CPUState* cpu, uint64_t pc,
7480
void libafl_exit_request_breakpoint(CPUState* cpu, target_ulong pc);
7581
void libafl_exit_request_custom_insn(CPUState* cpu, target_ulong pc,
7682
enum libafl_custom_insn_kind kind);
77-
78-
#ifndef CONFIG_USER_ONLY
83+
void libafl_exit_request_crash(void);
7984
void libafl_exit_request_timeout(void);
80-
#endif
8185

8286
struct libafl_exit_reason* libafl_get_exit_reason(void);

libafl/exit.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,18 @@ void libafl_exit_request_breakpoint(CPUState* cpu, target_ulong pc)
126126
prepare_qemu_exit(cpu, pc);
127127
}
128128

129+
void libafl_exit_request_crash(void)
130+
{
131+
CPUClass* cc = CPU_GET_CLASS(current_cpu);
132+
133+
expected_exit = true;
134+
last_exit_reason.kind = CRASH;
135+
last_exit_reason.cpu = current_cpu;
136+
137+
// TODO: put real PC
138+
prepare_qemu_exit(current_cpu, cc->get_pc(current_cpu));
139+
}
140+
129141
#ifndef CONFIG_USER_ONLY
130142
void libafl_exit_request_timeout(void)
131143
{

linux-user/signal.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
//// --- Begin LibAFL code ---
3939

4040
#include "libafl/user.h"
41+
#include "libafl/exit.h"
4142

4243
//// --- End LibAFL code ---
4344

@@ -1284,7 +1285,10 @@ static void handle_pending_signal(CPUArchState *cpu_env, int sig,
12841285
sig != TARGET_SIGURG &&
12851286
sig != TARGET_SIGWINCH &&
12861287
sig != TARGET_SIGCONT) {
1287-
dump_core_and_abort(cpu_env, sig);
1288+
//// --- Start LibAFL code ---
1289+
// dump_core_and_abort(cpu_env, sig);
1290+
libafl_exit_request_crash();
1291+
//// --- End LibAFL code ---
12881292
}
12891293
} else if (handler == TARGET_SIG_IGN) {
12901294
/* ignore sig */

0 commit comments

Comments
 (0)