-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy pathafl.patch
2951 lines (2657 loc) · 92.7 KB
/
afl.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff -urN afl-2.52b-c49750c9e27e29100d055292453551d560e594ce/afl-analyze.c afl/afl-analyze.c
--- afl-2.52b-c49750c9e27e29100d055292453551d560e594ce/afl-analyze.c 2020-01-07 20:20:26.000000000 +0100
+++ afl/afl-analyze.c 2022-01-13 02:40:51.926359942 +0100
@@ -807,7 +807,8 @@
" -f file - input file read by the tested program (stdin)\n"
" -t msec - timeout for each run (%u ms)\n"
" -m megs - memory limit for child process (%u MB)\n"
- " -Q - use binary-only instrumentation (QEMU mode)\n\n"
+ " -Q - use binary-only instrumentation (QEMU mode)\n"
+ " -U - use unicorn-based instrumentation (Unicorn mode)\n\n"
"Analysis settings:\n\n"
@@ -937,20 +938,19 @@
}
-
/* Main entry point */
int main(int argc, char** argv) {
s32 opt;
- u8 mem_limit_given = 0, timeout_given = 0, qemu_mode = 0;
+ u8 mem_limit_given = 0, timeout_given = 0, qemu_mode = 0, unicorn_mode = 0;
char** use_argv;
doc_path = access(DOC_PATH, F_OK) ? "docs" : DOC_PATH;
SAYF(cCYA "afl-analyze " cBRI VERSION cRST " by <lcamtuf@google.com>\n");
- while ((opt = getopt(argc,argv,"+i:f:m:t:eQ")) > 0)
+ while ((opt = getopt(argc,argv,"+i:f:m:t:eQU")) > 0)
switch (opt) {
@@ -1030,6 +1030,14 @@
qemu_mode = 1;
break;
+ case 'U':
+
+ if (unicorn_mode) FATAL("Multiple -U options not supported");
+ if (!mem_limit_given) mem_limit = MEM_LIMIT_UNICORN;
+
+ unicorn_mode = 1;
+ break;
+
default:
usage(argv[0]);
diff -urN afl-2.52b-c49750c9e27e29100d055292453551d560e594ce/afl-cmin afl/afl-cmin
--- afl-2.52b-c49750c9e27e29100d055292453551d560e594ce/afl-cmin 2020-01-07 20:20:26.000000000 +0100
+++ afl/afl-cmin 2022-01-13 02:40:51.926359942 +0100
@@ -49,11 +49,11 @@
TIMEOUT=none
unset IN_DIR OUT_DIR STDIN_FILE EXTRA_PAR MEM_LIMIT_GIVEN \
- AFL_CMIN_CRASHES_ONLY AFL_CMIN_ALLOW_ANY QEMU_MODE
+ AFL_CMIN_CRASHES_ONLY AFL_CMIN_ALLOW_ANY QEMU_MODE UNICORN_MODE \
+ CONSISTENCY
-while getopts "+i:o:f:m:t:eQC" opt; do
-
- case "$opt" in
+while getopts "+i:o:f:m:t:eQUCK" opt; do
+ case "$opt" in
"i")
IN_DIR="$OPTARG"
@@ -83,10 +83,17 @@
test "$MEM_LIMIT_GIVEN" = "" && MEM_LIMIT=250
QEMU_MODE=1
;;
+ "U")
+ EXTRA_PAR="$EXTRA_PAR -U"
+ test "$MEM_LIMIT_GIVEN" = "" && MEM_LIMIT=250
+ UNICORN_MODE=1
+ ;;
"?")
exit 1
;;
-
+ "K")
+ CONSISTENCY=1
+ ;;
esac
done
@@ -111,6 +118,7 @@
-m megs - memory limit for child process ($MEM_LIMIT MB)
-t msec - run time limit for child process (none)
-Q - use binary-only instrumentation (QEMU mode)
+ -U - use unicorn-based instrumentation (Unicorn mode)
Minimization settings:
@@ -196,7 +204,7 @@
fi
-if [ "$AFL_SKIP_BIN_CHECK" = "" -a "$QEMU_MODE" = "" ]; then
+if [ "$AFL_SKIP_BIN_CHECK" = "" -a "$QEMU_MODE" = "" -a "$UNICORN_MODE" = "" ]; then
if ! grep -qF "__AFL_SHM_ID" "$TARGET_BIN"; then
echo "[-] Error: binary '$TARGET_BIN' doesn't appear to be instrumented." 1>&2
@@ -307,32 +315,13 @@
(
- CUR=0
-
if [ "$STDIN_FILE" = "" ]; then
- while read -r fn; do
-
- CUR=$((CUR+1))
- printf "\\r Processing file $CUR/$IN_COUNT... "
-
- "$SHOWMAP" -m "$MEM_LIMIT" -t "$TIMEOUT" -o "$TRACE_DIR/$fn" -Z $EXTRA_PAR -- "$@" <"$IN_DIR/$fn"
-
- done < <(ls "$IN_DIR")
+ "$SHOWMAP" -m "$MEM_LIMIT" -t "$TIMEOUT" -o "$TRACE_DIR" -i "$IN_DIR" -Z $EXTRA_PAR -- "$@" <"$IN_DIR/$fn"
else
- while read -r fn; do
-
- CUR=$((CUR+1))
- printf "\\r Processing file $CUR/$IN_COUNT... "
-
- cp "$IN_DIR/$fn" "$STDIN_FILE"
-
- "$SHOWMAP" -m "$MEM_LIMIT" -t "$TIMEOUT" -o "$TRACE_DIR/$fn" -Z $EXTRA_PAR -A "$STDIN_FILE" -- "$@" </dev/null
-
- done < <(ls "$IN_DIR")
-
+ "$SHOWMAP" -m "$MEM_LIMIT" -t "$TIMEOUT" -o "$TRACE_DIR" -i "$IN_DIR" -Z $EXTRA_PAR -A "$STDIN_FILE" -- "$@" </dev/null
fi
@@ -456,6 +445,8 @@
echo "[+] Narrowed down to $OUT_COUNT files, saved in '$OUT_DIR'."
echo
-test "$AFL_KEEP_TRACES" = "" && rm -rf "$TRACE_DIR"
+if [ "$CONSISTENCY" != "1" ]; then
+ test "$AFL_KEEP_TRACES" = "" && rm -rf "$TRACE_DIR"
+fi
exit 0
diff -urN afl-2.52b-c49750c9e27e29100d055292453551d560e594ce/afl-fuzz.c afl/afl-fuzz.c
--- afl-2.52b-c49750c9e27e29100d055292453551d560e594ce/afl-fuzz.c 2020-01-07 20:20:26.000000000 +0100
+++ afl/afl-fuzz.c 2022-01-13 02:40:51.926359942 +0100
@@ -1,5 +1,5 @@
/*
- american fuzzy lop - fuzzer code
+ American Fuzzy Lop - fuzzer code
--------------------------------
Written and maintained by Michal Zalewski <lcamtuf@google.com>
@@ -56,6 +56,8 @@
#include <sys/ioctl.h>
#include <sys/file.h>
+#include <assert.h>
+
#if defined(__APPLE__) || defined(__FreeBSD__) || defined (__OpenBSD__)
# include <sys/sysctl.h>
#endif /* __APPLE__ || __FreeBSD__ || __OpenBSD__ */
@@ -118,6 +120,7 @@
shuffle_queue, /* Shuffle input queue? */
bitmap_changed = 1, /* Time to update bitmap? */
qemu_mode, /* Running in QEMU mode? */
+ unicorn_mode, /* Running in Unicorn mode? */
skip_requested, /* Skip request, via SIGUSR1 */
run_over10m, /* Run time over 10 minutes? */
persistent_mode, /* Running in persistent mode? */
@@ -476,31 +479,62 @@
closedir(d);
- for (i = 0; i < cpu_core_count; i++) if (!cpu_used[i]) break;
+ int bound = 0;
+ int tried_bind = 0;
+ int saved_errno = 0;
- if (i == cpu_core_count) {
+ for (i = 0; i < cpu_core_count; i++) {
- SAYF("\n" cLRD "[-] " cRST
- "Uh-oh, looks like all %u CPU cores on your system are allocated to\n"
- " other instances of afl-fuzz (or similar CPU-locked tasks). Starting\n"
- " another fuzzer on this machine is probably a bad plan, but if you are\n"
- " absolutely sure, you can set AFL_NO_AFFINITY and try again.\n",
- cpu_core_count);
+ if (!cpu_used[i]) {
+
+ OKF("Found a free CPU core, attempting bind to #%u.", i);
+
+ CPU_ZERO(&c);
+ CPU_SET(i, &c);
+
+ if (sched_setaffinity(0, sizeof(c), &c)) {
- FATAL("No more free CPU cores");
+ saved_errno = errno;
+ tried_bind++;
+ WARNF("Binding attempt failed; looking for another core...");
+
+ } else {
+
+ cpu_aff = i;
+ bound = 1;
+ break;
+ }
+ }
}
- OKF("Found a free CPU core, binding to #%u.", i);
+ if (!bound) {
+
+ if (tried_bind == 0) {
+
+ SAYF("\n" cLRD "[-] " cRST
+ "Uh-oh, looks like all %u CPU cores on your system are allocated to\n"
+ " other instances of afl-fuzz (or similar CPU-locked tasks). Starting\n"
+ " another fuzzer on this machine is probably a bad plan, but if you are\n"
+ " absolutely sure, you can set AFL_NO_AFFINITY and try again.\n\n",
+ cpu_core_count);
+ FATAL("No more free CPU cores");
- cpu_aff = i;
+ } else {
- CPU_ZERO(&c);
- CPU_SET(i, &c);
+ SAYF("\n" cLRD "[-] " cRST
+ "Uh-oh, afl-fuzz found %u apparently free CPU cores, but the system\n"
+ " wouldn't let us bind to any of them. This can happen if we do not\n"
+ " have CAP_SYS_NICE, or if we are running in a container that is\n"
+ " restricted to a certain set of CPUs that already have processes bound\n"
+ " to them. For a quick workaround, set AFL_NO_AFFINITY and try again.\n",
+ tried_bind);
- if (sched_setaffinity(0, sizeof(c), &c))
- PFATAL("sched_setaffinity failed");
+ errno = saved_errno;
+ PFATAL("sched_setaffinity failed");
+ }
+ }
}
#endif /* HAVE_AFFINITY */
@@ -1990,6 +2024,8 @@
if (!forksrv_pid) {
+ /* CHILD PROCESS */
+
struct rlimit r;
/* Umpf. On OpenBSD, the default fd limit for root users is set to
@@ -2035,8 +2071,23 @@
setsid();
- dup2(dev_null_fd, 1);
- dup2(dev_null_fd, 2);
+ if (getenv("AFL_LOG_TARGET_OUTPUT")) {
+ /* Log target output to a file */
+ char *log_path;
+ int log_fd;
+ assert(asprintf(&log_path, "%s/%s", out_dir, "log.txt") > 0);
+ ACTF("Logging is enabled, logging to %s\n", log_path);
+ log_fd = open(log_path, O_RDWR | O_CREAT | O_TRUNC, S_IRWXU);
+ assert(log_fd >= 0);
+ free(log_path);
+ dup2(log_fd, 1);
+ dup2(log_fd, 2);
+ close(log_fd);
+ } else {
+ dup2(dev_null_fd, 1);
+ dup2(dev_null_fd, 2);
+ }
+
if (out_file) {
@@ -2095,6 +2146,8 @@
}
+ /* PARENT PROCESS */
+
/* Close the unneeded endpoints. */
close(ctl_pipe[0]);
@@ -3429,7 +3482,7 @@
"exec_timeout : %u\n"
"afl_banner : %s\n"
"afl_version : " VERSION "\n"
- "target_mode : %s%s%s%s%s%s%s\n"
+ "target_mode : %s%s%s%s%s%s%s%s\n"
"command_line : %s\n",
start_time / 1000, get_cur_time() / 1000, getpid(),
queue_cycle ? (queue_cycle - 1) : 0, total_execs, eps,
@@ -3439,10 +3492,10 @@
unique_hangs, last_path_time / 1000, last_crash_time / 1000,
last_hang_time / 1000, total_execs - last_crash_execs,
exec_tmout, use_banner,
- qemu_mode ? "qemu " : "", dumb_mode ? " dumb " : "",
+ unicorn_mode ? "unicorn" : "", qemu_mode ? "qemu " : "", dumb_mode ? " dumb " : "",
no_forkserver ? "no_forksrv " : "", crash_mode ? "crash " : "",
persistent_mode ? "persistent " : "", deferred_mode ? "deferred " : "",
- (qemu_mode || dumb_mode || no_forkserver || crash_mode ||
+ (unicorn_mode || qemu_mode || dumb_mode || no_forkserver || crash_mode ||
persistent_mode || deferred_mode) ? "" : "default",
orig_cmdline);
/* ignore errors */
@@ -4366,7 +4419,7 @@
SAYF("\n");
- if (avg_us > (qemu_mode ? 50000 : 10000))
+ if (avg_us > ((qemu_mode || unicorn_mode) ? 50000 : 10000))
WARNF(cLRD "The target binary is pretty slow! See %s/perf_tips.txt.",
doc_path);
@@ -6901,7 +6954,7 @@
#endif /* ^!__APPLE__ */
- if (!qemu_mode && !dumb_mode &&
+ if (!qemu_mode && !unicorn_mode && !dumb_mode &&
!memmem(f_data, f_len, SHM_ENV_VAR, strlen(SHM_ENV_VAR) + 1)) {
SAYF("\n" cLRD "[-] " cRST
@@ -6921,15 +6974,15 @@
}
- if (qemu_mode &&
+ if ((qemu_mode || unicorn_mode) &&
memmem(f_data, f_len, SHM_ENV_VAR, strlen(SHM_ENV_VAR) + 1)) {
SAYF("\n" cLRD "[-] " cRST
"This program appears to be instrumented with afl-gcc, but is being run in\n"
- " QEMU mode (-Q). This is probably not what you want - this setup will be\n"
- " slow and offer no practical benefits.\n");
+ " QEMU or Unicorn mode (-Q or -U). This is probably not what you want -\n"
+ " this setup will be slow and offer no practical benefits.\n");
- FATAL("Instrumentation found in -Q mode");
+ FATAL("Instrumentation found in -Q or -U mode");
}
@@ -7054,8 +7107,9 @@
" -f file - location read by the fuzzed program (stdin)\n"
" -t msec - timeout for each run (auto-scaled, 50-%u ms)\n"
" -m megs - memory limit for child process (%u MB)\n"
- " -Q - use binary-only instrumentation (QEMU mode)\n\n"
-
+ " -Q - use binary-only instrumentation (QEMU mode)\n"
+ " -U - use Unicorn-based instrumentation (Unicorn mode)\n\n"
+
"Fuzzing behavior settings:\n\n"
" -d - quick & dirty mode (skips deterministic steps)\n"
@@ -7598,7 +7652,10 @@
}
-/* Rewrite argv for QEMU. */
+/* Rewrite argv for QEMU.
+ Specifically, this changes the command call to:
+ $ {AFL_PATH}/afl-qemu-trace -- {target_bin} {test_input_path and args}
+ */
static char** get_qemu_argv(u8* own_loc, char** argv, int argc) {
@@ -7670,7 +7727,6 @@
}
-
/* Make a copy of the current command line. */
static void save_cmdline(u32 argc, char** argv) {
@@ -7723,7 +7779,7 @@
gettimeofday(&tv, &tz);
srandom(tv.tv_sec ^ tv.tv_usec ^ getpid());
- while ((opt = getopt(argc, argv, "+i:o:f:m:t:T:dnCB:S:M:x:Q")) > 0)
+ while ((opt = getopt(argc, argv, "+i:o:f:m:t:T:dnCB:S:M:x:QU")) > 0)
switch (opt) {
@@ -7891,6 +7947,15 @@
break;
+ case 'U': /* Unicorn mode */
+
+ if (unicorn_mode) FATAL("Multiple -U options not supported");
+ unicorn_mode = 1;
+
+ if (!mem_limit_given) mem_limit = MEM_LIMIT_UNICORN;
+
+ break;
+
default:
usage(argv[0]);
@@ -7909,8 +7974,9 @@
if (dumb_mode) {
- if (crash_mode) FATAL("-C and -n are mutually exclusive");
- if (qemu_mode) FATAL("-Q and -n are mutually exclusive");
+ if (crash_mode) FATAL("-C and -n are mutually exclusive");
+ if (qemu_mode) FATAL("-Q and -n are mutually exclusive");
+ if (unicorn_mode) FATAL("-U and -n are mutually exclusive");
}
diff -urN afl-2.52b-c49750c9e27e29100d055292453551d560e594ce/afl-showmap.c afl/afl-showmap.c
--- afl-2.52b-c49750c9e27e29100d055292453551d560e594ce/afl-showmap.c 2020-01-07 20:20:26.000000000 +0100
+++ afl/afl-showmap.c 2022-01-13 02:40:51.926359942 +0100
@@ -46,11 +46,16 @@
#include <sys/types.h>
#include <sys/resource.h>
-static s32 child_pid; /* PID of the tested program */
+static s32 forksrv_pid, /* PID of the fork server */
+ child_pid; /* PID of the tested program */
+
+static s32 fsrv_ctl_fd, /* Fork server control pipe (write) */
+ fsrv_st_fd; /* Fork server status pipe (read) */
static u8* trace_bits; /* SHM with instrumentation bitmap */
-static u8 *out_file, /* Trace output file */
+static u8 *out_path, /* Trace output file / dir */
+ *in_path, /* Program input file / dir */
*doc_path, /* Path to docs */
*target_path, /* Path to target binary */
*at_file; /* Substitution string for @@ */
@@ -61,12 +66,20 @@
static s32 shm_id; /* ID of the SHM region */
+static s32 at_file_fd, /* Persistent fd for tmp_input_file */
+ dev_null_fd = -1; /* Persistent fd for /dev/null */
+
static u8 quiet_mode, /* Hide non-essential messages? */
edges_only, /* Ignore hit counts? */
cmin_mode, /* Generate output in afl-cmin mode? */
binary_mode, /* Write output as a binary map */
keep_cores; /* Allow coredumps? */
+static u8 batch_mode,
+ no_output,
+ using_file_arg,
+ allocated_at_file;
+
static volatile u8
stop_soon, /* Ctrl-C pressed? */
child_timed_out, /* Child timed out? */
@@ -103,6 +116,19 @@
};
+struct queue_entry {
+ struct queue_entry *next;
+ u8 *in_path;
+ u32 in_len;
+ u8 *out_path;
+};
+
+/* Append new test case to the queue. */
+struct queue_entry *queue_top = 0;
+struct queue_entry *queue = 0;
+int queued_paths = 0;
+
+
static void classify_counts(u8* mem, const u8* map) {
u32 i = MAP_SIZE;
@@ -159,31 +185,115 @@
}
-/* Write results. */
+static void setup_at_file(void) {
+ u8 *use_dir = ".";
-static u32 write_results(void) {
+ if (access(use_dir, R_OK | W_OK | X_OK))
+ {
- s32 fd;
- u32 i, ret = 0;
+ use_dir = getenv("TMPDIR");
+ if (!use_dir)
+ use_dir = "/tmp";
+ }
- u8 cco = !!getenv("AFL_CMIN_CRASHES_ONLY"),
- caa = !!getenv("AFL_CMIN_ALLOW_ANY");
+ at_file = alloc_printf("%s/.afl-showmap-temp-%u", use_dir, getpid());
- if (!strncmp(out_file, "/dev/", 5)) {
+ unlink(at_file);
- fd = open(out_file, O_WRONLY, 0600);
- if (fd < 0) PFATAL("Unable to open '%s'", out_file);
+ at_file_fd = open(at_file, O_RDWR | O_CREAT | O_EXCL, 0600);
- } else if (!strcmp(out_file, "-")) {
+ if (at_file_fd < 0) PFATAL("Unable to create '%s'", at_file);
- fd = dup(1);
- if (fd < 0) PFATAL("Unable to open stdout");
+ allocated_at_file = 1;
+}
- } else {
- unlink(out_file); /* Ignore errors */
- fd = open(out_file, O_WRONLY | O_CREAT | O_EXCL, 0600);
- if (fd < 0) PFATAL("Unable to create '%s'", out_file);
+#define CHK_FORMAT(_divisor, _limit_mult, _fmt, _cast) do { \
+ if (val < (_divisor) * (_limit_mult)) { \
+ sprintf(tmp[cur], _fmt, ((_cast)val) / (_divisor)); \
+ return tmp[cur]; \
+ } \
+ } while (0)
+
+
+/* Describe integer as memory size. */
+
+static u8* DMS(u64 val) {
+
+ static u8 tmp[12][16];
+ static u8 cur;
+
+ cur = (cur + 1) % 12;
+
+ /* 0-9999 */
+ CHK_FORMAT(1, 10000, "%llu B", u64);
+
+ /* 10.0k - 99.9k */
+ CHK_FORMAT(1024, 99.95, "%0.01f kB", double);
+
+ /* 100k - 999k */
+ CHK_FORMAT(1024, 1000, "%llu kB", u64);
+
+ /* 1.00M - 9.99M */
+ CHK_FORMAT(1024 * 1024, 9.995, "%0.02f MB", double);
+
+ /* 10.0M - 99.9M */
+ CHK_FORMAT(1024 * 1024, 99.95, "%0.01f MB", double);
+
+ /* 100M - 999M */
+ CHK_FORMAT(1024 * 1024, 1000, "%llu MB", u64);
+
+ /* 1.00G - 9.99G */
+ CHK_FORMAT(1024LL * 1024 * 1024, 9.995, "%0.02f GB", double);
+
+ /* 10.0G - 99.9G */
+ CHK_FORMAT(1024LL * 1024 * 1024, 99.95, "%0.01f GB", double);
+
+ /* 100G - 999G */
+ CHK_FORMAT(1024LL * 1024 * 1024, 1000, "%llu GB", u64);
+
+ /* 1.00T - 9.99G */
+ CHK_FORMAT(1024LL * 1024 * 1024 * 1024, 9.995, "%0.02f TB", double);
+
+ /* 10.0T - 99.9T */
+ CHK_FORMAT(1024LL * 1024 * 1024 * 1024, 99.95, "%0.01f TB", double);
+
+#undef CHK_FORMAT
+
+ /* 100T+ */
+ strcpy(tmp[cur], "infty");
+ return tmp[cur];
+
+}
+
+
+/* Write results. */
+
+static u32 write_results(u8 *out_path) {
+
+ s32 fd;
+ u32 i, ret = 0;
+ if(no_output) {
+ return 0;
+ }
+
+ u8 cco = !!getenv("AFL_CMIN_CRASHES_ONLY"),
+ caa = !!getenv("AFL_CMIN_ALLOW_ANY");
+
+ if (!strncmp(out_path, "/dev/", 5))
+ {
+
+ fd = open(out_path, O_WRONLY, 0600);
+ if (fd < 0)
+ PFATAL("Unable to open '%s'", out_path);
+
+ } else
+ {
+
+ unlink(out_path); /* Ignore errors */
+ fd = open(out_path, O_WRONLY | O_CREAT | O_EXCL, 0600);
+ if (fd < 0)
+ PFATAL("Unable to create '%s'", out_path);
}
@@ -193,7 +303,7 @@
for (i = 0; i < MAP_SIZE; i++)
if (trace_bits[i]) ret++;
- ck_write(fd, trace_bits, MAP_SIZE, out_file);
+ ck_write(fd, trace_bits, MAP_SIZE, out_path);
close(fd);
} else {
@@ -222,8 +332,7 @@
}
- return ret;
-
+ return ret;
}
@@ -242,64 +351,89 @@
static void run_target(char** argv) {
static struct itimerval it;
+ static u32 prev_timed_out = 0;
int status = 0;
if (!quiet_mode)
SAYF("-- Program output begins --\n" cRST);
+ memset(trace_bits, 0, MAP_SIZE);
MEM_BARRIER();
- child_pid = fork();
+ s32 res;
- if (child_pid < 0) PFATAL("fork() failed");
+ if (in_path) {
+ /* we have the fork server up and running, so simply
+ tell it to have at it, and then read back PID. */
- if (!child_pid) {
+ if ((res = write(fsrv_ctl_fd, &prev_timed_out, 4)) != 4) {
- struct rlimit r;
+ if (stop_soon) return;
+ RPFATAL(res, "Unable to request new process from fork server (OOM?)");
- if (quiet_mode) {
+ }
- s32 fd = open("/dev/null", O_RDWR);
+ if ((res = read(fsrv_st_fd, &child_pid, 4)) != 4) {
- if (fd < 0 || dup2(fd, 1) < 0 || dup2(fd, 2) < 0) {
- *(u32*)trace_bits = EXEC_FAIL_SIG;
- PFATAL("Descriptor initialization failed");
- }
-
- close(fd);
+ if (stop_soon) return;
+ RPFATAL(res, "Unable to request new process from fork server (OOM?)");
}
- if (mem_limit) {
+ if (child_pid <= 0) FATAL("Fork server is misbehaving (OOM?)");
+ } else {
+ child_pid = fork();
- r.rlim_max = r.rlim_cur = ((rlim_t)mem_limit) << 20;
+ if (child_pid < 0) PFATAL("fork() failed");
-#ifdef RLIMIT_AS
+ if (!child_pid) {
- setrlimit(RLIMIT_AS, &r); /* Ignore errors */
+ struct rlimit r;
-#else
+ if (quiet_mode) {
- setrlimit(RLIMIT_DATA, &r); /* Ignore errors */
+ s32 fd = open("/dev/null", O_RDWR);
-#endif /* ^RLIMIT_AS */
+ if (fd < 0 || dup2(fd, 1) < 0 || dup2(fd, 2) < 0) {
+ *(u32*)trace_bits = EXEC_FAIL_SIG;
+ PFATAL("Descriptor initialization failed");
+ }
- }
+ close(fd);
- if (!keep_cores) r.rlim_max = r.rlim_cur = 0;
- else r.rlim_max = r.rlim_cur = RLIM_INFINITY;
+ }
- setrlimit(RLIMIT_CORE, &r); /* Ignore errors */
+ if (mem_limit) {
- if (!getenv("LD_BIND_LAZY")) setenv("LD_BIND_NOW", "1", 0);
+ r.rlim_max = r.rlim_cur = ((rlim_t)mem_limit) << 20;
- setsid();
+ #ifdef RLIMIT_AS
- execv(target_path, argv);
+ setrlimit(RLIMIT_AS, &r); /* Ignore errors */
- *(u32*)trace_bits = EXEC_FAIL_SIG;
- exit(0);
+ #else
+
+ setrlimit(RLIMIT_DATA, &r); /* Ignore errors */
+
+ #endif /* ^RLIMIT_AS */
+
+ }
+
+ if (!keep_cores) r.rlim_max = r.rlim_cur = 0;
+ else r.rlim_max = r.rlim_cur = RLIM_INFINITY;
+
+ setrlimit(RLIMIT_CORE, &r); /* Ignore errors */
+
+ if (!getenv("LD_BIND_LAZY")) setenv("LD_BIND_NOW", "1", 0);
+ setsid();
+
+ execv(target_path, argv);
+
+ *(u32*)trace_bits = EXEC_FAIL_SIG;
+ exit(0);
+
+ }
}
/* Configure timeout, wait for child, cancel timeout. */
@@ -314,7 +448,16 @@
setitimer(ITIMER_REAL, &it, NULL);
- if (waitpid(child_pid, &status, 0) <= 0) FATAL("waitpid() failed");
+ if(in_path) {
+ if ((res = read(fsrv_st_fd, &status, 4)) != 4) {
+
+ if (stop_soon) return;
+ RPFATAL(res, "Unable to communicate with fork server (OOM?)");
+
+ }
+ } else {
+ if (waitpid(child_pid, &status, 0) <= 0) FATAL("waitpid() failed");
+ }
child_pid = 0;
it.it_value.tv_sec = 0;
@@ -427,24 +570,32 @@
u8* aa_loc = strstr(argv[i], "@@");
if (aa_loc) {
+ using_file_arg = 1;
- u8 *aa_subst, *n_arg;
+ u8 *aa_subst, *n_arg;
- if (!at_file) FATAL("@@ syntax is not supported by this tool.");
+ if (!in_path && !at_file)
+ FATAL("@@ syntax is not supported by this tool.");
- /* Be sure that we're always using fully-qualified paths. */
+ if (!at_file)
+ setup_at_file();
- if (at_file[0] == '/') aa_subst = at_file;
- else aa_subst = alloc_printf("%s/%s", cwd, at_file);
+ /* Be sure that we're always using fully-qualified paths. */
- /* Construct a replacement argv value. */
+ if (at_file[0] == '/')
+ aa_subst = at_file;
+ else
+ aa_subst = alloc_printf("%s/%s", cwd, at_file);
- *aa_loc = 0;
- n_arg = alloc_printf("%s%s%s", argv[i], aa_subst, aa_loc + 2);
- argv[i] = n_arg;
- *aa_loc = '@';
+ /* Construct a replacement argv value. */
- if (at_file[0] != '/') ck_free(aa_subst);
+ *aa_loc = 0;
+ n_arg = alloc_printf("%s%s%s", argv[i], aa_subst, aa_loc + 2);
+ argv[i] = n_arg;
+ *aa_loc = '@';
+
+ if (at_file[0] != '/')
+ ck_free(aa_subst);
}
@@ -475,13 +626,16 @@
"Required parameters:\n\n"
- " -o file - file to write the trace data to\n\n"
+ " -i file - file or dir to get inputs from\n"
+ " -o file - file or dir to write the trace data to. Use '-' for no output\n\n"
"Execution control settings:\n\n"
" -t msec - timeout for each run (none)\n"
" -m megs - memory limit for child process (%u MB)\n"
- " -Q - use binary-only instrumentation (QEMU mode)\n\n"
+ " -Q - use binary-only instrumentation (QEMU mode)\n"
+ " -U - use Unicorn-based instrumentation (Unicorn mode)\n"
+ " (Not necessary, here for consistency with other afl-* tools)\n\n"
"Other settings:\n\n"
@@ -615,25 +769,499 @@
}
+/* Spin up fork server (instrumented mode only). The idea is explained here:
+
+ http://lcamtuf.blogspot.com/2014/10/fuzzing-binaries-without-execve.html
+
+ In essence, the instrumentation allows us to skip execve(), and just keep
+ cloning a stopped child. So, we just execute once, and then send commands
+ through a pipe. The other part of this logic is in afl-as.h. */
+
+static void init_forkserver(char** argv) {
+
+ static struct itimerval it;
+ int st_pipe[2], ctl_pipe[2];
+ int status;
+ s32 rlen;
+
+ ACTF("Spinning up the fork server...");
+
+ if (pipe(st_pipe) || pipe(ctl_pipe))
+ PFATAL("pipe() failed");
+
+ forksrv_pid = fork();
+
+ if (forksrv_pid < 0) PFATAL("fork() failed");
+
+ if (!forksrv_pid) {
+
+ struct rlimit r;
+
+ /* Umpf. On OpenBSD, the default fd limit for root users is set to
+ soft 128. Let's try to fix that... */
+
+ if (!getrlimit(RLIMIT_NOFILE, &r) && r.rlim_cur < FORKSRV_FD + 2) {
+
+ r.rlim_cur = FORKSRV_FD + 2;
+ setrlimit(RLIMIT_NOFILE, &r); /* Ignore errors */
+
+ }
+
+ if (mem_limit) {
+
+ r.rlim_max = r.rlim_cur = ((rlim_t)mem_limit) << 20;
+
+#ifdef RLIMIT_AS
+
+ setrlimit(RLIMIT_AS, &r); /* Ignore errors */
+
+#else
+
+ /* This takes care of OpenBSD, which doesn't have RLIMIT_AS, but
+ according to reliable sources, RLIMIT_DATA covers anonymous
+ maps - so we should be getting good protection against OOM bugs. */
+
+ setrlimit(RLIMIT_DATA, &r); /* Ignore errors */
+
+#endif /* ^RLIMIT_AS */
+
+
+ }
+
+ /* Dumping cores is slow and can lead to anomalies if SIGKILL is delivered
+ before the dump is complete. */
+
+ r.rlim_max = r.rlim_cur = 0;
+
+ setrlimit(RLIMIT_CORE, &r); /* Ignore errors */
+
+ /* Isolate the process and configure standard descriptors. If at_path is
+ specified, stdin is /dev/null; otherwise, at_file_fd is cloned instead. */
+
+ setsid();
+
+ dup2(dev_null_fd, 1);
+ dup2(dev_null_fd, 2);
+
+ if (using_file_arg) {
+ dup2(dev_null_fd, 0);
+ } else {
+
+ dup2(at_file_fd, 0);
+ close(at_file_fd);
+
+ }
+
+ /* Set up control and status pipes, close the unneeded original fds. */
+
+ if (dup2(ctl_pipe[0], FORKSRV_FD) < 0) PFATAL("dup2() failed");
+ if (dup2(st_pipe[1], FORKSRV_FD + 1) < 0) PFATAL("dup2() failed");
+
+ close(ctl_pipe[0]);
+ close(ctl_pipe[1]);
+ close(st_pipe[0]);
+ close(st_pipe[1]);
+
+ close(dev_null_fd);
+
+ /* This should improve performance a bit, since it stops the linker from
+ doing extra work post-fork(). */
+
+ if (!getenv("LD_BIND_LAZY")) setenv("LD_BIND_NOW", "1", 0);
+
+ /* Set sane defaults for ASAN if nothing else specified. */
+
+ setenv("ASAN_OPTIONS", "abort_on_error=1:"
+ "detect_leaks=0:"
+ "symbolize=0:"
+ "allocator_may_return_null=1", 0);
+
+ /* MSAN is tricky, because it doesn't support abort_on_error=1 at this
+ point. So, we do this in a very hacky way. */
+
+ setenv("MSAN_OPTIONS", "exit_code=" STRINGIFY(MSAN_ERROR) ":"
+ "symbolize=0:"
+ "abort_on_error=1:"
+ "allocator_may_return_null=1:"
+ "msan_track_origins=0", 0);
+
+ execv(target_path, argv);
+
+ /* Use a distinctive bitmap signature to tell the parent about execv()
+ falling through. */
+
+ *(u32*)trace_bits = EXEC_FAIL_SIG;
+ exit(0);
+
+ }
+
+ /* Close the unneeded endpoints. */
+
+ close(ctl_pipe[0]);
+ close(st_pipe[1]);
+
+ fsrv_ctl_fd = ctl_pipe[1];
+ fsrv_st_fd = st_pipe[0];
+
+ /* Wait for the fork server to come up, but don't wait too long. */
+
+ it.it_value.tv_sec = ((exec_tmout * FORK_WAIT_MULT) / 1000);
+ it.it_value.tv_usec = ((exec_tmout * FORK_WAIT_MULT) % 1000) * 1000;
+
+ setitimer(ITIMER_REAL, &it, NULL);
+
+ rlen = read(fsrv_st_fd, &status, 4);
+
+ it.it_value.tv_sec = 0;
+ it.it_value.tv_usec = 0;
+
+ setitimer(ITIMER_REAL, &it, NULL);
+
+ /* If we have a four-byte "hello" message from the server, we're all set.
+ Otherwise, try to figure out what went wrong. */
+
+ if (rlen == 4) {
+ OKF("All right - fork server is up.");
+ return;