Skip to content

Commit 50ab121

Browse files
author
Ubuntu
committed
fix bug
1 parent 633957c commit 50ab121

File tree

2 files changed

+11
-31
lines changed

2 files changed

+11
-31
lines changed

cnn_afl_soft.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import os
66
import numpy as np
77
import glob
8-
import ipdb
98
import random
109
import math
1110
from keras.callbacks import ModelCheckpoint
@@ -67,7 +66,7 @@ def process_data():
6766
for f in seed_list:
6867
tmp_list = []
6968
try:
70-
out = call(['afl-showmap', '-q', '-e', '-o', '/dev/stdout', './miniunz','-o', f])
69+
out = call(['afl-showmap', '-q', '-e', '-o', '/dev/stdout', './nm-new','-C', f])
7170
except subprocess.CalledProcessError:
7271
print("find a crash")
7372
for line in out.splitlines():
@@ -423,5 +422,5 @@ def setup_server():
423422
conn.sendall("start")
424423
conn.close()
425424

426-
gen_grad('sloww')
425+
gen_grad('train')
427426
setup_server()

neuzz.c

+9-28
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ static int shm_id;
3737

3838
#define HAVOC_BLK_SMALL 2048
3939
#define HAVOC_BLK_MEDIUM 4096
40-
#define HAVOC_BLK_LARGE 8192
40+
#define HAVOC_BLK_LARGE 7400
4141

4242

4343
#define HAVOC_BLK_XL 4096
@@ -50,10 +50,10 @@ static int cpu_aff = -1;
5050
int round_cnt = 0;
5151
int edge_gain=0;
5252

53-
int stage_num = 0;
53+
int stage_num = 1;
5454
int old=0;
5555
int now=0;
56-
int fast=0;
56+
int fast=1;
5757
char * target_path;
5858
typedef uint8_t u8;
5959
typedef uint16_t u16;
@@ -91,7 +91,7 @@ size_t len;
9191
int loc[10240];
9292
int sign[10240];
9393
//int num_index[23] = {0,2,4,8,16,32,64,128,256,512,1024,1536,2048,2560,3072, 3584,4096,4608,5120, 5632,6144,6656,7103};
94-
int num_index[14] = {0,2,4,8,16,32,64,128,256,512,1024,2048,4096,8305};
94+
int num_index[14] = {0,2,4,8,16,32,64,128,256,512,1024,2048,4096,7405};
9595

9696
// file list
9797
char **file_list;
@@ -1312,14 +1312,14 @@ void gen_mutate_slow1(){
13121312

13131313
int tmout_cnt = 0;
13141314
//flip interesting locations within 10 iterations
1315-
for(int iter=0 ;iter<520; iter=iter+1){
1315+
for(int iter=0 ;iter<463; iter=iter+1){
13161316
memcpy(out_buf1, out_buf, len);
13171317
memcpy(out_buf2, out_buf, len);
13181318
//find mutation range for every iteration
13191319
int low_index = iter*16;
13201320
int up_index = 16*(iter+1);
1321-
if(iter == 519)
1322-
up_index = 8305;
1321+
if(iter == 462)
1322+
up_index = 7405;
13231323
u8 up_step = 0;
13241324
u8 low_step = 0;
13251325
for(int index=low_index; index<up_index; index=index+1){
@@ -1354,17 +1354,6 @@ void gen_mutate_slow1(){
13541354
else
13551355
out_buf1[loc[index]] = mut_val;
13561356
}
1357-
1358-
//total_execs++;
1359-
/*
1360-
char* mut_fn = alloc_printf("%s/id_%06d", out_dir, mut_cnt);
1361-
int mut_fd = open(mut_fn, O_WRONLY | O_CREAT | O_EXCL, 0600);
1362-
ck_write(mut_fd, out_buf1, len, mut_fn);
1363-
free(mut_fn);
1364-
close(mut_fd);
1365-
mut_cnt = mut_cnt + 1;
1366-
*/
1367-
13681357
write_to_testcase(out_buf1, len);
13691358
int fault = run_target(exec_tmout);
13701359
if (fault != 0){
@@ -1424,16 +1413,6 @@ void gen_mutate_slow1(){
14241413
else
14251414
out_buf2[loc[index]] = mut_val;
14261415
}
1427-
//total_execs++;
1428-
/*
1429-
char* mut_fn = alloc_printf("%s/id_%06d", out_dir, mut_cnt);
1430-
int mut_fd = open(mut_fn, O_WRONLY | O_CREAT | O_EXCL, 0600);
1431-
ck_write(mut_fd, out_buf2, len, mut_fn);
1432-
close(mut_fd);
1433-
free(mut_fn);
1434-
mut_cnt = mut_cnt + 1;
1435-
*/
1436-
14371416
write_to_testcase(out_buf2, len);
14381417
int fault = run_target(exec_tmout);
14391418
if (fault != 0){
@@ -2061,11 +2040,13 @@ void fuzz_lop(char * grad_file, int sock){
20612040
if((line_cnt % 10) == 0){
20622041
printf("$$$$&&&& fuzz %s line_cnt %d\n",fn, line_cnt);
20632042
printf("edge num %d\n",count_non_255_bytes(virgin_bits));
2043+
fflush (stdout);
20642044
}
20652045
}
20662046
else{
20672047
printf("$$$$&&&& fuzz %s line_cnt %d\n",fn, line_cnt);
20682048
printf("edge num %d\n",count_non_255_bytes(virgin_bits));
2049+
fflush (stdout);
20692050
}
20702051

20712052
//read seed into mem

0 commit comments

Comments
 (0)