ExternalVendorCode/AFLplusplus
1
0
Fork 0
mirror of https://github.com/AFLplusplus/AFLplusplus.git synced 2025-06-19 04:58:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

denug

Browse Source
This commit is contained in:
vanhauser-thc
2023-10-03 17:07:33 +02:00
parent e7de6ee948
commit 0f79a9d14f
1 changed files with 34 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
instrumentation/afl-compiler-rt.o.c
View File

@ -666,6 +666,7 @@ static void __afl_map_shm(void) {
} }
if (id_str) { if (id_str) {
// /dev/null doesn't work so we use /dev/urandom // /dev/null doesn't work so we use /dev/urandom
if ((__afl_dummy_fd[1] = open("/dev/urandom", O_WRONLY)) < 0) { if ((__afl_dummy_fd[1] = open("/dev/urandom", O_WRONLY)) < 0) {
@ -1117,7 +1118,12 @@ static void __afl_start_forkserver(void) {
} }
if (1 == CMPLOG_U256 && __afl_cmp_map) { status_for_fsrv |= FS_OPT_U256CMPLOG; } if (1 == CMPLOG_U256 && __afl_cmp_map) {
status_for_fsrv |= FS_OPT_U256CMPLOG;
}
if (__afl_sharedmem_fuzzing) { status_for_fsrv |= FS_OPT_SHDMEM_FUZZ; } if (__afl_sharedmem_fuzzing) { status_for_fsrv |= FS_OPT_SHDMEM_FUZZ; }
if (status_for_fsrv) { if (status_for_fsrv) {
@ -2384,8 +2390,12 @@ void __cmplog_rtn_hook_str(u8 *ptr1, u8 *ptr2) {
/* hook function for all other func(ptr, ptr, ...) variants */ /* hook function for all other func(ptr, ptr, ...) variants */
void __cmplog_rtn_hook(u8 *ptr1, u8 *ptr2) { void __cmplog_rtn_hook(u8 *ptr1, u8 *ptr2) {
fprintf(stderr, "RTN1 %p %p\n", ptr1, ptr2);
u32 i; u32 i;
if (area_is_valid(ptr1, 31 + _CMPLOG_EXTRA) <= 0 || area_is_valid(ptr2, 31 + _CMPLOG_EXTRA) <= 0) return; if (area_is_valid(ptr1, 31 + _CMPLOG_EXTRA) <= 0 ||
area_is_valid(ptr2, 31 + _CMPLOG_EXTRA) <= 0)
return;
fprintf(stderr, "rtn arg0="); fprintf(stderr, "rtn arg0=");
for (i = 0; i < 32; i++) for (i = 0; i < 32; i++)
fprintf(stderr, "%02x", ptr1[i]); fprintf(stderr, "%02x", ptr1[i]);
@ -2394,7 +2404,6 @@ void __cmplog_rtn_hook(u8 *ptr1, u8 *ptr2) {
fprintf(stderr, "%02x", ptr2[i]); fprintf(stderr, "%02x", ptr2[i]);
fprintf(stderr, "\n"); fprintf(stderr, "\n");
fprintf(stderr, "RTN1 %p %p\n", ptr1, ptr2);
if (likely(!__afl_cmp_map)) return; if (likely(!__afl_cmp_map)) return;
int l1, l2; int l1, l2;
if ((l1 = area_is_valid(ptr1, 31 + _CMPLOG_EXTRA)) <= 0 || if ((l1 = area_is_valid(ptr1, 31 + _CMPLOG_EXTRA)) <= 0 ||
@ -2444,10 +2453,13 @@ void __cmplog_rtn_hook(u8 *ptr1, u8 *ptr2) {
information and pass it on to the standard binary rtn hook */ information and pass it on to the standard binary rtn hook */
void __cmplog_rtn_hook_n(u8 *ptr1, u8 *ptr2, u64 len) { void __cmplog_rtn_hook_n(u8 *ptr1, u8 *ptr2, u64 len) {
fprintf(stderr, "__cmplog_rtn_hook_n %llu, %p %p\n", len, ptr1, ptr2);
u32 i; u32 i;
fprintf(stderr, "__cmplog_rtn_hook_n %llu, %p %p\n", ptr1, ptr2); if (area_is_valid(ptr1, 31 + _CMPLOG_EXTRA) <= 0 ||
if (area_is_valid(ptr1, 31 + _CMPLOG_EXTRA) <= 0 || area_is_valid(ptr2, 31 + _CMPLOG_EXTRA) <= 0) return; area_is_valid(ptr2, 31 + _CMPLOG_EXTRA) <= 0)
fprintf(stderr, "rtn_n len=%u arg0=", len); return;
fprintf(stderr, "rtn_n len=%llu arg0=", len);
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
fprintf(stderr, "%02x", ptr1[i]); fprintf(stderr, "%02x", ptr1[i]);
fprintf(stderr, " arg1="); fprintf(stderr, " arg1=");