ExternalVendorCode/AFLplusplus
1
0
Fork 0
mirror of https://github.com/AFLplusplus/AFLplusplus.git synced 2025-06-13 02:28:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

afl-untracer freebsd 13.1 and above update.

Browse Source 
with the new kern.elf*.allow_wx setting, we try
 to make sure we still can make the maps w/x,
fixing few build warnings while at it.
This commit is contained in:
David CARLIER
2022-12-23 12:06:40 +00:00
parent 0165ca8c6c
commit 401811a97d
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
utils/afl_untracer/afl-untracer.c
View File

@ -156,7 +156,7 @@ void read_library_information(void) {
*e = 0; *e = 0;
if (n[strlen(n) - 1] == '\n') n[strlen(n) - 1] = 0; if (n[strlen(n) - 1] == '\n') n[strlen(n) - 1] = 0;
liblist[liblist_cnt].name = strdup(n); liblist[liblist_cnt].name = (u8 *)strdup((char *)n);
liblist[liblist_cnt].addr_start = strtoull(b, NULL, 16); liblist[liblist_cnt].addr_start = strtoull(b, NULL, 16);
liblist[liblist_cnt].addr_end = strtoull(m, NULL, 16); liblist[liblist_cnt].addr_end = strtoull(m, NULL, 16);
if (debug) if (debug)
@ -210,16 +210,16 @@ void read_library_information(void) {
!(region->kve_protection & KVME_PROT_EXEC)) { !(region->kve_protection & KVME_PROT_EXEC)) {
liblist[liblist_cnt].name = liblist[liblist_cnt].name =
region->kve_path[0] != '\0' ? strdup(region->kve_path) : 0; region->kve_path[0] != '\0' ? (u8 *)strdup(region->kve_path) : 0;
liblist[liblist_cnt].addr_start = region->kve_start; liblist[liblist_cnt].addr_start = region->kve_start;
liblist[liblist_cnt].addr_end = region->kve_end; liblist[liblist_cnt].addr_end = region->kve_end;
if (debug) { if (debug) {
fprintf(stderr, "%s:%x (%lx-%lx)\n", liblist[liblist_cnt].name, fprintf(stderr, "%s:%lx (%lx-%lx)\n", liblist[liblist_cnt].name,
liblist[liblist_cnt].addr_end - liblist[liblist_cnt].addr_start, (unsigned long)(liblist[liblist_cnt].addr_end - liblist[liblist_cnt].addr_start),
liblist[liblist_cnt].addr_start, (unsigned long)liblist[liblist_cnt].addr_start,
liblist[liblist_cnt].addr_end - 1); (unsigned long)(liblist[liblist_cnt].addr_end - 1));
} }
@ -488,6 +488,12 @@ void setup_trap_instrumentation(void) {
uint32_t bitmap_index = 0; uint32_t bitmap_index = 0;
#endif #endif
#if defined(__FreeBSD__) && __FreeBSD_version >= 1301000
// We try to allow W/X pages despite kern.elf32/64.allow_wx system settings
int allow_wx = PROC_WX_MAPPINGS_PERMIT;
(void)procctl(P_PID, 0, PROC_WXMAP_CTL, &allow_wx);
#endif
while ((nread = getline(&line, &len, patches)) != -1) { while ((nread = getline(&line, &len, patches)) != -1) {
char *end = line + len; char *end = line + len;
@ -699,7 +705,7 @@ int main(int argc, char *argv[]) {
if (argc > 1) { if (argc > 1) {
use_stdin = 0; use_stdin = 0;
inputfile = argv[1]; inputfile = (u8 *)argv[1];
} }
@ -732,7 +738,7 @@ int main(int argc, char *argv[]) {
if (pid) { if (pid) {
u32 status; u32 status;
if (waitpid(pid, &status, 0) < 0) exit(1); if (waitpid(pid, (int *)&status, 0) < 0) exit(1);
/* report the test case is done and wait for the next */ /* report the test case is done and wait for the next */
__afl_end_testcase(status); __afl_end_testcase(status);