From fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 03:14:29 +0200 Subject: Merging upstream version 125.0.1. Signed-off-by: Daniel Baumann --- taskcluster/scripts/misc/afl-nyx.patch | 35 ++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'taskcluster/scripts/misc/afl-nyx.patch') diff --git a/taskcluster/scripts/misc/afl-nyx.patch b/taskcluster/scripts/misc/afl-nyx.patch index 67b460900c..94a1bbb31d 100644 --- a/taskcluster/scripts/misc/afl-nyx.patch +++ b/taskcluster/scripts/misc/afl-nyx.patch @@ -16,3 +16,38 @@ index 988e536e..5e9870c0 100644 +#define MAP_SIZE_POW2 23 /* Do not change this unless you really know what you are doing. */ + +diff --git a/instrumentation/afl-compiler-rt.o.c b/instrumentation/afl-compiler-rt.o.c +index caa3c3a8..76ceb451 100644 +--- a/instrumentation/afl-compiler-rt.o.c ++++ b/instrumentation/afl-compiler-rt.o.c +@@ -1837,7 +1837,7 @@ void __sanitizer_cov_pcs_init(const uintptr_t *pcs_beg, + + } + +- if (pc_filter) { ++ if (pc_filter && !mod_info->next) { + + char PcDescr[1024]; + // This function is a part of the sanitizer run-time. +@@ -1864,7 +1864,7 @@ void __sanitizer_cov_pcs_init(const uintptr_t *pcs_beg, + + } + +- if (__afl_filter_pcs && strstr(mod_info->name, __afl_filter_pcs_module)) { ++ if (__afl_filter_pcs && !mod_info->next && strstr(mod_info->name, __afl_filter_pcs_module)) { + + u32 result_index; + if (locate_in_pcs(PC, &result_index)) { +@@ -1889,7 +1889,11 @@ void __sanitizer_cov_pcs_init(const uintptr_t *pcs_beg, + + } + +- mod_info->mapped = 1; ++ if (__afl_pcmap_ptr) { ++ ++ mod_info->mapped = 1; ++ ++ } + + if (__afl_debug) { -- cgit v1.2.3