david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dump_pt: create-open & truncate output file on each execution

Browse Source 
Previous implementation only opened the file once.
This commit is contained in:
Steffen Schulz 2021-08-09 16:24:27 -07:00
parent 5c24050a64
commit 56bc5571be
3 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nyx/interface.c
View File

@ -278,7 +278,7 @@ static bool verify_workdir_state(nyx_interface_state *s, Error **errp){
if(s->dump_pt_trace){ if(s->dump_pt_trace){
assert(asprintf(&tmp, "%s/pt_trace_dump_%d", workdir, id) != -1); assert(asprintf(&tmp, "%s/pt_trace_dump_%d", workdir, id) != -1);
pt_open_pt_trace_file(tmp); pt_trace_dump_enable(tmp);
free(tmp); free(tmp);
} }

38
nyx/pt.c
View File

@ -54,20 +54,34 @@ uint32_t alt_bitmap_size = 0;
uint8_t* alt_bitmap = NULL; uint8_t* alt_bitmap = NULL;
int pt_trace_dump_fd = 0; int pt_trace_dump_fd = 0;
char *pt_trace_dump_filename;
bool should_dump_pt_trace= false; /* dump PT trace as returned from HW */ bool should_dump_pt_trace= false; /* dump PT trace as returned from HW */
void pt_open_pt_trace_file(char* filename){ void pt_trace_dump_enable(char* filename)
printf("using pt trace at %s",filename); {
pt_trace_dump_fd = open(filename, O_CREAT|O_TRUNC|O_WRONLY, 0644); int test_fd;
printf("Enable pt trace dump at %s", filename);
pt_trace_dump_filename = filename;
should_dump_pt_trace = true; should_dump_pt_trace = true;
assert(pt_trace_dump_fd >= 0);
test_fd = open(filename, O_CREAT|O_TRUNC|O_WRONLY, 0644);
if (test_fd < 0)
fprintf(stderr, "Error accessing pt_dump output path: %s", strerror(errno));
assert(test_fd >= 0);
} }
void pt_trucate_pt_trace_file(void){ void pt_write_pt_dump_file(uint8_t *data, size_t bytes)
if(should_dump_pt_trace){ {
assert(lseek(pt_trace_dump_fd, 0, SEEK_SET) == 0); int fd;
assert(ftruncate(pt_trace_dump_fd, 0)==0);
} if (!should_dump_pt_trace)
return;
fd = open(pt_trace_dump_filename, O_CREAT|O_TRUNC|O_WRONLY, 0644);
assert(fd >= 0);
assert(bytes == write(fd, data, bytes));
} }
static void pt_set(CPUState *cpu, run_on_cpu_data arg){ static void pt_set(CPUState *cpu, run_on_cpu_data arg){
@ -166,9 +180,8 @@ void dump_pt_trace(void* buffer, int bytes){
#endif #endif
void pt_dump(CPUState *cpu, int bytes){ void pt_dump(CPUState *cpu, int bytes){
if(should_dump_pt_trace){ pt_write_pt_dump_file(cpu->pt_mmap, bytes);
assert(bytes == write(pt_trace_dump_fd, cpu->pt_mmap, bytes));
}
if(!(GET_GLOBAL_STATE()->redqueen_state && GET_GLOBAL_STATE()->redqueen_state->intercept_mode)){ if(!(GET_GLOBAL_STATE()->redqueen_state && GET_GLOBAL_STATE()->redqueen_state->intercept_mode)){
if (GET_GLOBAL_STATE()->in_fuzzing_mode && GET_GLOBAL_STATE()->decoder_page_fault == false && GET_GLOBAL_STATE()->decoder && !GET_GLOBAL_STATE()->dump_page){ if (GET_GLOBAL_STATE()->in_fuzzing_mode && GET_GLOBAL_STATE()->decoder_page_fault == false && GET_GLOBAL_STATE()->decoder && !GET_GLOBAL_STATE()->dump_page){
GET_GLOBAL_STATE()->pt_trace_size += bytes; GET_GLOBAL_STATE()->pt_trace_size += bytes;
@ -204,7 +217,6 @@ int pt_enable(CPUState *cpu, bool hmp_mode){
delete_trace_files(); delete_trace_files();
alt_bitmap_reset(); alt_bitmap_reset();
} }
pt_trucate_pt_trace_file();
return pt_cmd(cpu, KVM_VMX_PT_ENABLE, hmp_mode); return pt_cmd(cpu, KVM_VMX_PT_ENABLE, hmp_mode);
} }

4
nyx/pt.h
View File

@ -44,7 +44,7 @@ void pt_post_kvm_run(CPUState *cpu);
void pt_handle_overflow(CPUState *cpu); void pt_handle_overflow(CPUState *cpu);
void pt_dump(CPUState *cpu, int bytes); void pt_dump(CPUState *cpu, int bytes);
void pt_open_pt_trace_file(char* filename); void pt_trace_dump_enable(char* filename);
void pt_trucate_pt_trace_file(void); void pt_write_pt_dump_file(uint8_t *data, size_t bytes);
#endif #endif