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
|
#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
#include <getopt.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#include <string.h>
#include <sys/mman.h>
#include <cstdlib>
#include <iostream>
#include <vector>
#include <string>
#include <sstream>
#include <climits>
// DyninstAPI includes
#include "BPatch.h"
#include "BPatch_binaryEdit.h"
#include "BPatch_flowGraph.h"
#include "BPatch_function.h"
#include "BPatch_point.h"
#include "BPatch_addressSpace.h"
#include "BPatch_process.h"
#include "dyninstversion.h" // if this include errors, compile and install https://github.com/dyninst/dyninst
using namespace std;
using namespace Dyninst;
//cmd line options
char *originalBinary;
char *instrumentedBinary;
char *entryPointName = NULL;
int verbose = 0;
Dyninst::Address entryPoint;
set < string > instrumentLibraries;
set < string > runtimeLibraries;
set < string > skipAddresses;
set < unsigned long > exitAddresses;
unsigned int bbMinSize = 1;
int bbSkip = 0, performance = 0;
bool skipMainModule = false, do_bb = true, dynfix = false;
unsigned long int insertions = 0;
uintptr_t mapaddr = 0;
BPatch_function *save_rdi;
BPatch_function *restore_rdi;
const char *functions[] = { "main", "_main", "_initproc", "_init", "start", "_start", NULL };
const char *instLibrary = "libAflDyninst.so";
static const char *OPT_STR = "fi:o:l:e:E:vs:dr:m:S:Dx";
static const char *USAGE = "-dfvxD -i <binary> -o <binary> -l <library> -e <address> -E <address> -s <number> -S <funcname> -m <size>\n \
-i: input binary \n \
-o: output binary\n \
-d: do not instrument the binary, only supplied libraries\n \
-l: linked library to instrument (repeat for more than one)\n \
-r: runtime library to instrument (path to, repeat for more than one)\n \
-e: entry point address to patch (required for stripped binaries)\n \
-E: exit point - force exit(0) at this address (repeat for more than one)\n \
-s: number of initial basic blocks to skip in binary\n \
-m: minimum size of a basic bock to instrument (default: 1)\n \
-f: try to fix a dyninst bug that leads to crashes (loss of 20%% performance)\n \
-S: do not instrument this function (repeat for more than one)\n \
-D: instrument only a simple fork server and also forced exit functions\n \
-x: experimental performance mode\n \
-v: verbose output\n";
bool parseOptions(int argc, char **argv) {
int c;
while ((c = getopt(argc, argv, OPT_STR)) != -1) {
switch ((char) c) {
case 'x':
performance++;
if (performance == 3) {
#if ( __amd64__ || __x86_64__ )
fprintf(stderr, "Warning: performance level 3 is currently totally experimental\n");
#else
fprintf(stderr, "Warning: maximum performance level for non-intelx64 x86 is 2\n");
performance = 2;
#endif
} else if (performance > 3) {
fprintf(stderr, "Warning: maximum performance level is 3\n");
performance = 3;
}
break;
case 'S':
skipAddresses.insert(optarg);
break;
case 'e':
if ((entryPoint = strtoul(optarg, NULL, 16)) < 0x1000)
entryPointName = optarg;
break;
case 'i':
originalBinary = optarg;
instrumentLibraries.insert(optarg);
break;
case 'o':
instrumentedBinary = optarg;
break;
case 'l':
instrumentLibraries.insert(optarg);
break;
case 'E':
exitAddresses.insert(strtoul(optarg, NULL, 16));
break;
case 'r':
runtimeLibraries.insert(optarg);
break;
case 's':
bbSkip = atoi(optarg);
break;
case 'm':
bbMinSize = atoi(optarg);
break;
case 'd':
skipMainModule = true;
break;
case 'f':
#if (__amd64__ || __x86_64__)
dynfix = true;
#endif
break;
case 'D':
do_bb = false;
break;
case 'v':
verbose++;
break;
default:
cerr << "Usage: " << argv[0] << USAGE;
return false;
}
}
if (performance > 0 && do_bb == false) {
cerr << "Warning: -x performance options only enhance basic block coverage, not forkserver only mode" << endl;
performance = 0;
}
if (originalBinary == NULL) {
cerr << "Input binary is required!" << endl;
cerr << "Usage: " << argv[0] << USAGE;
return false;
}
if (instrumentedBinary == NULL) {
cerr << "Output binary is required!" << endl;
cerr << "Usage: " << argv[0] << USAGE;
return false;
}
if (skipMainModule && instrumentLibraries.empty()) {
cerr << "If using option -d , option -l is required." << endl;
cerr << "Usage: " << argv[0] << USAGE;
return false;
}
return true;
}
BPatch_function *findFuncByName(BPatch_image * appImage, char *funcName) {
BPatch_Vector < BPatch_function * >funcs;
if (NULL == appImage->findFunction(funcName, funcs) || !funcs.size()
|| NULL == funcs[0]) {
cerr << "Failed to find " << funcName << " function." << endl;
return NULL;
}
return funcs[0];
}
// insert callback to initialization function in the instrumentation library
// either at _init or at manualy specified entry point.
bool insertCallToInit(BPatch_binaryEdit *appBin, BPatch_function *instIncFunc, BPatch_module *module, BPatch_function *funcInit) {
/* Find the instrumentation points */
vector < BPatch_point * >points;
vector < BPatch_point * >*funcEntry = funcInit->findPoint(BPatch_entry);
if (NULL == funcEntry) {
cerr << "Failed to find entry for function. " << endl;
return false;
}
cout << "Inserting init callback." << endl;
BPatch_Vector < BPatch_snippet * >instArgs; // init has no args
BPatch_funcCallExpr instIncExpr(*instIncFunc, instArgs);
/* Insert the snippet at function entry */
BPatchSnippetHandle *handle = appBin->insertSnippet(instIncExpr, *funcEntry, BPatch_callBefore,
BPatch_lastSnippet);
if (!handle) {
cerr << "Failed to insert init callback." << endl;
return false;
}
return true;
}
// inserts a callback for each basic block assigning it an instrumentation
// time 16bit random ID just as afl
bool insertBBCallback(BPatch_binaryEdit *appBin, BPatch_function *curFunc, char *funcName, BPatch_function *instBBIncFunc, int *bbIndex) {
BPatch_flowGraph *appCFG = curFunc->getCFG();
unsigned short randID;
if (!appCFG) {
cerr << "Failed to find CFG for function " << funcName << endl;
return false;
}
BPatch_Set < BPatch_basicBlock * >allBlocks;
if (!appCFG->getAllBasicBlocks(allBlocks)) {
cerr << "Failed to find basic blocks for function " << funcName << endl;
return false;
} else if (allBlocks.size() == 0) {
cerr << "No basic blocks for function " << funcName << endl;
return false;
}
BPatch_Set < BPatch_basicBlock * >::iterator iter;
for (iter = allBlocks.begin(); iter != allBlocks.end(); iter++) {
if (*bbIndex < bbSkip || (*iter)->size() < bbMinSize) { // skip over first bbSkip bbs or below minimum size
(*bbIndex)++;
continue;
}
unsigned long address = (*iter)->getStartAddress();
randID = rand() % USHRT_MAX;
if (verbose) {
cout << "Instrumenting Basic Block 0x" << hex << address << " of " << funcName << " with size " << dec << (*iter)->size() << " with random id " << randID << "/0x" << hex << randID << endl;
}
BPatch_Vector < BPatch_snippet * >instArgs1;
BPatch_Vector < BPatch_snippet * >instArgs;
BPatch_constExpr bbId(randID);
instArgs.push_back(&bbId);
BPatch_point *bbEntry = (*iter)->findEntryPoint();
if (NULL == bbEntry) {
// warn the user, but continue
cerr << "Failed to find entry for basic block at 0x" << hex << address << endl;
(*bbIndex)++;
continue;
}
BPatch_funcCallExpr instIncExpr1(*save_rdi, instArgs1);
BPatch_funcCallExpr instIncExpr3(*restore_rdi, instArgs1);
BPatch_funcCallExpr instIncExpr(*instBBIncFunc, instArgs);
BPatchSnippetHandle *handle;
if (dynfix == true)
handle = appBin->insertSnippet(instIncExpr1, *bbEntry, BPatch_callBefore, BPatch_lastSnippet);
handle = appBin->insertSnippet(instIncExpr, *bbEntry, BPatch_callBefore, BPatch_lastSnippet);
if (dynfix == true)
handle = appBin->insertSnippet(instIncExpr3, *bbEntry, BPatch_callBefore, BPatch_lastSnippet);
if (!handle) {
// warn the user, but continue to next bb
cerr << "Failed to insert instrumention in basic block at 0x" << hex << address << endl;
(*bbIndex)++;
continue;
} else
insertions++;
(*bbIndex)++;
}
return true;
}
int main(int argc, char **argv) {
char *func2patch = NULL;
int loop;
if (argc < 3 || strncmp(argv[1], "-h", 2) == 0 || strncmp(argv[1], "--h", 3) == 0) {
cout << "Usage: " << argv[0] << USAGE;
return false;
}
if (!parseOptions(argc, argv)) {
return EXIT_FAILURE;
}
#if (__amd64__ || __x86_64__)
if (do_bb == true) {
if (DYNINST_MAJOR_VERSION < 9 || (DYNINST_MAJOR_VERSION == 9 && DYNINST_MINOR_VERSION < 3)
|| (DYNINST_MAJOR_VERSION == 9 && DYNINST_MINOR_VERSION == 3 && DYNINST_PATCH_VERSION <= 2)) {
if (dynfix == false)
fprintf(stderr, "Warning: your dyninst version does not include a critical fix, you should use the -f option!\n");
} else {
if (dynfix == true)
fprintf(stderr, "Notice: your dyninst version is fixed, the -f option should not be necessary.\n");
}
}
#endif
BPatch bpatch;
BPatch_binaryEdit *appBin = bpatch.openBinary(originalBinary, instrumentLibraries.size() != 1);
if (appBin == NULL) {
cerr << "Failed to open binary" << endl;
return EXIT_FAILURE;
}
BPatch_image *appImage = appBin->getImage();
//get and iterate over all modules, instrumenting only the default and manually specified ones
vector < BPatch_module * >*modules = appImage->getModules();
vector < BPatch_module * >::iterator moduleIter;
vector < BPatch_function * >*funcsInModule;
BPatch_module *defaultModule = NULL, *firstModule = NULL;
string defaultModuleName;
// look for _init
if (defaultModuleName.empty()) {
for (loop = 0; functions[loop] != NULL && func2patch == NULL; loop++) {
for (moduleIter = modules->begin(); moduleIter != modules->end(); ++moduleIter) {
vector < BPatch_function * >::iterator funcsIterator;
char moduleName[1024];
if (firstModule == NULL)
firstModule = (*moduleIter);
(*moduleIter)->getName(moduleName, 1024);
funcsInModule = (*moduleIter)->getProcedures();
if (verbose >= 2)
cout << "Looking for init function " << functions[loop] << " in " << moduleName << endl;
for (funcsIterator = funcsInModule->begin(); funcsIterator != funcsInModule->end(); ++funcsIterator) {
char funcName[1024];
(*funcsIterator)->getName(funcName, 1024);
if (verbose >= 3 && loop == 0)
printf("module: %s function: %s\n", moduleName, funcName);
if (string(funcName) == string(functions[loop])) {
func2patch = (char *) functions[loop];
defaultModuleName = string(moduleName);
defaultModule = (*moduleIter);
if (verbose >= 1) {
cout << "Found " << func2patch << " in " << moduleName << endl;
}
break;
}
}
if (!defaultModuleName.empty())
break;
}
if (func2patch != NULL)
break;
}
}
// last resort, by name of the binary
if (defaultModuleName.empty())
defaultModuleName = string(originalBinary).substr(string(originalBinary).find_last_of("\\/") + 1);
if (defaultModule == NULL)
defaultModule = firstModule;
if (!appBin->loadLibrary(instLibrary)) {
cerr << "Failed to open instrumentation library " << instLibrary << endl;
cerr << "It needs to be located in the current working directory." << endl;
return EXIT_FAILURE;
}
/* Find code coverage functions in the instrumentation library */
BPatch_function *initAflForkServer;
save_rdi = findFuncByName(appImage, (char *) "save_rdi");
restore_rdi = findFuncByName(appImage, (char *) "restore_rdi");
BPatch_function *bbCallback = findFuncByName(appImage, (char *) "bbCallback");
BPatch_function *forceCleanExit = findFuncByName(appImage, (char *) "forceCleanExit");
if (do_bb == true) {
if (performance >= 3)
initAflForkServer = findFuncByName(appImage, (char *) "initAflForkServerVar");
else
initAflForkServer = findFuncByName(appImage, (char *) "initAflForkServer");
} else
initAflForkServer = findFuncByName(appImage, (char *) "initOnlyAflForkServer");
if (!initAflForkServer || !bbCallback || !save_rdi || !restore_rdi || !forceCleanExit) {
cerr << "Instrumentation library lacks callbacks!" << endl;
return EXIT_FAILURE;
}
int bbIndex = 0;
// if an entrypoint was set then find function, else find _init
BPatch_function *funcToPatch = NULL;
if (entryPoint == 0 && entryPointName == NULL) {
if (func2patch == NULL) {
cerr << "Couldn't locate _init, specify entry point manually with -e 0xaddr" << endl;
return EXIT_FAILURE;
}
BPatch_Vector < BPatch_function * >funcs;
defaultModule->findFunction(func2patch, funcs);
if (!funcs.size()) {
cerr << "Couldn't locate _init, specify entry point manually with -e 0xaddr" << endl;
return EXIT_FAILURE;
}
// there should really be only one
funcToPatch = funcs[0];
} else {
if (entryPointName != NULL) {
for (moduleIter = modules->begin(); moduleIter != modules->end() && funcToPatch == 0; ++moduleIter) {
BPatch_Vector < BPatch_function * >funcs;
(*moduleIter)->findFunction(entryPointName, funcs);
if (funcs.size() > 0) {
char moduleName[1024];
funcToPatch = funcs[0];
defaultModule = (*moduleIter);
defaultModule->getName(moduleName, 1024);
defaultModuleName = string(moduleName);
printf("Found entypoint %s in module %s\n", entryPointName, moduleName);
break;
}
}
}
if (!funcToPatch) {
if (verbose > 1)
printf("Looking for entrypoint %p\n", (char *) entryPoint);
funcToPatch = defaultModule->findFunctionByEntry(entryPoint);
if (!funcToPatch && defaultModule != firstModule) {
funcToPatch = firstModule->findFunctionByEntry(entryPoint);
if (funcToPatch)
defaultModule = firstModule;
}
if (!funcToPatch) { // ok lets go hardcore ...
if (verbose > 1)
printf("OK we did not find the entrypoint so far, lets dig deeper ...\n");
for (moduleIter = modules->begin(); moduleIter != modules->end() && funcToPatch != NULL; ++moduleIter) {
vector < BPatch_function * >::iterator funcsIterator;
funcToPatch = (*moduleIter)->findFunctionByEntry(entryPoint);
if (funcToPatch)
defaultModule = (*moduleIter);
}
}
if (funcToPatch && verbose >= 1) {
char moduleName[1024];
defaultModule->getName(moduleName, 1024);
defaultModuleName = string(moduleName);
printf("Found entypoint %p in module %s\n", (void *) entryPoint, moduleName);
}
}
}
if (!funcToPatch) {
cerr << "Couldn't locate function at given entry point. " << endl;
cerr << "Try: readelf -ls " << originalBinary << " | egrep 'Entry|FUNC.*GLOBAL.*DEFAULT' | egrep -v '@|UND'" << endl;
return EXIT_FAILURE;
}
if (!insertCallToInit(appBin, initAflForkServer, defaultModule, funcToPatch)) {
cerr << "Could not insert init callback at given entry point." << endl;
return EXIT_FAILURE;
}
for (moduleIter = modules->begin(); moduleIter != modules->end(); ++moduleIter) {
char moduleName[1024];
(*moduleIter)->getName(moduleName, 1024);
if ((*moduleIter)->isSharedLib()) {
if (instrumentLibraries.find(moduleName) == instrumentLibraries.end()) {
cout << "Skipping library: " << moduleName << endl;
continue;
}
}
if (string(moduleName).find(defaultModuleName) != string::npos) {
if (skipMainModule)
continue;
}
if (do_bb == true) {
cout << "Instrumenting module: " << moduleName << endl;
vector < BPatch_function * >*allFunctions = (*moduleIter)->getProcedures();
vector < BPatch_function * >::iterator funcIter;
// iterate over all functions in the module
for (funcIter = allFunctions->begin(); funcIter != allFunctions->end(); ++funcIter) {
BPatch_function *curFunc = *funcIter;
char funcName[1024];
int do_patch = 1;
curFunc->getName(funcName, 1024);
if (string(funcName) == string("_init") || string(funcName) == string("__libc_csu_init") || string(funcName) == string("_start")
)
continue; // here's a bug on hlt // XXX: check what happens if removed
if (!skipAddresses.empty()) {
set < string >::iterator saiter;
for (saiter = skipAddresses.begin(); saiter != skipAddresses.end() && do_patch == 1; saiter++)
if (*saiter == string(funcName))
do_patch = 0;
if (do_patch == 0) {
cout << "Skipping instrumenting function " << funcName << endl;
continue;
}
}
insertBBCallback(appBin, curFunc, funcName, bbCallback, &bbIndex);
}
}
}
if (!exitAddresses.empty()) {
cout << "Instrumenting forced exit addresses." << endl;
set < unsigned long >::iterator uliter;
for (uliter = exitAddresses.begin(); uliter != exitAddresses.end(); uliter++) {
if (*uliter > 0 && (signed long)*uliter != -1) {
funcToPatch = defaultModule->findFunctionByEntry(*uliter);
if (!funcToPatch) {
cerr << "Could not find enty point 0x" << hex << *uliter << " (continuing)" << endl;
} else {
if (!insertCallToInit(appBin, forceCleanExit, defaultModule, funcToPatch))
cerr << "Could not insert force clean exit callback at 0x" << hex << *uliter << " (continuing)" << endl;
}
}
}
}
cout << "Saving the instrumented binary to " << instrumentedBinary << " ..." << endl;
// Output the instrumented binary
if (!appBin->writeFile(instrumentedBinary)) {
cerr << "Failed to write output file: " << instrumentedBinary << endl;
return EXIT_FAILURE;
}
if (!runtimeLibraries.empty()) {
cout << "Instrumenting runtime libraries." << endl;
set < string >::iterator rtLibIter;
for (rtLibIter = runtimeLibraries.begin(); rtLibIter != runtimeLibraries.end(); rtLibIter++) {
BPatch_binaryEdit *libBin = bpatch.openBinary((*rtLibIter).c_str(), false);
if (libBin == NULL) {
cerr << "Failed to open binary " << *rtLibIter << endl;
return EXIT_FAILURE;
}
BPatch_image *libImg = libBin->getImage();
vector < BPatch_module * >*modules = libImg->getModules();
moduleIter = modules->begin();
for (; moduleIter != modules->end(); ++moduleIter) {
char moduleName[1024];
(*moduleIter)->getName(moduleName, 1024);
cout << "Instrumenting module: " << moduleName << endl;
vector < BPatch_function * >*allFunctions = (*moduleIter)->getProcedures();
vector < BPatch_function * >::iterator funcIter;
// iterate over all functions in the module
for (funcIter = allFunctions->begin(); funcIter != allFunctions->end(); ++funcIter) {
BPatch_function *curFunc = *funcIter;
char funcName[1024];
int do_patch = 1;
curFunc->getName(funcName, 1024);
if (string(funcName) == string("_init") || string(funcName) == string("__libc_csu_init") || string(funcName) == string("_start"))
continue;
if (!skipAddresses.empty()) {
set < string >::iterator saiter;
for (saiter = skipAddresses.begin(); saiter != skipAddresses.end() && do_patch == 1; saiter++)
if (*saiter == string(funcName))
do_patch = 0;
if (do_patch == 0) {
cout << "Skipping instrumenting function " << funcName << endl;
continue;
}
}
insertBBCallback(libBin, curFunc, funcName, bbCallback, &bbIndex);
}
}
if (!libBin->writeFile((*rtLibIter + ".ins").c_str())) {
cerr << "Failed to write output file: " << (*rtLibIter + ".ins").c_str() << endl;
return EXIT_FAILURE;
} else {
cout << "Saved the instrumented library to " << (*rtLibIter + ".ins").c_str() << "." << endl;
}
}
}
printf("Did a total of %lu basic block insertions\n", insertions);
cout << "All done! Happy fuzzing!" << endl;
return EXIT_SUCCESS;
}
|