about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Carlier <devnexen@gmail.com>2020-06-23 09:29:57 +0000
committerDavid Carlier <devnexen@gmail.com>2020-06-23 09:29:57 +0000
commit6c414409d404457fe067780c1d010fa6f915519f (patch)
tree989308b85fa12470759d610cf56991b5483205b3
parent7119bf5d860657dab7afb60fab8b7ad5dc0ef222 (diff)
downloadafl++-6c414409d404457fe067780c1d010fa6f915519f.tar.gz
libtokencap Haiku support
-rw-r--r--libtokencap/Makefile9
-rw-r--r--libtokencap/libtokencap.so.c17
2 files changed, 21 insertions, 5 deletions
diff --git a/libtokencap/Makefile b/libtokencap/Makefile
index 75a8d337..63b87bb0 100644
--- a/libtokencap/Makefile
+++ b/libtokencap/Makefile
@@ -35,10 +35,11 @@ _UNIQ=_QINU_
  _____OS_DL =  $(____OS_DL:$(_UNIQ)$(UNAME_S)=)
 ______OS_DL = $(_____OS_DL:$(_UNIQ)="-ldl")
 
-   _OS_TARGET = $(____OS_DL:$(_UNIQ)FreeBSD=$(_UNIQ))
-  __OS_TARGET =   $(_OS_TARGET:$(_UNIQ)OpenBSD=$(_UNIQ))
- ___OS_TARGET =  $(__OS_TARGET:$(_UNIQ)NetBSD=$(_UNIQ))
-____OS_TARGET = $(___OS_TARGET:$(_UNIQ)$(UNAME_S)=)
+    _OS_TARGET = $(____OS_DL:$(_UNIQ)FreeBSD=$(_UNIQ))
+   __OS_TARGET =    $(_OS_TARGET:$(_UNIQ)OpenBSD=$(_UNIQ))
+  ___OS_TARGET =   $(__OS_TARGET:$(_UNIQ)NetBSD=$(_UNIQ))
+ ____OS_TARGET =  $(___OS_TARGET:$(_UNIQ)Haiku=$(_UNIQ))
+_____OS_TARGET = $(___OS_TARGET:$(_UNIQ)$(UNAME_S)=)
 
 TARGETS       = $(____OS_TARGET:$(_UNIQ)=libtokencap.so)
 
diff --git a/libtokencap/libtokencap.so.c b/libtokencap/libtokencap.so.c
index 5a7cf3aa..88b5c041 100644
--- a/libtokencap/libtokencap.so.c
+++ b/libtokencap/libtokencap.so.c
@@ -34,7 +34,8 @@
 #include "../config.h"
 
 #if !defined __linux__ && !defined __APPLE__ && !defined __FreeBSD__ && \
-    !defined __OpenBSD__ && !defined __NetBSD__ && !defined __DragonFly__
+    !defined __OpenBSD__ && !defined __NetBSD__ && !defined __DragonFly__ && \
+    !defined(__HAIKU__)
   #error "Sorry, this library is unsupported in this platform for now!"
 #endif /* !__linux__ && !__APPLE__ && ! __FreeBSD__ && ! __OpenBSD__ && \
           !__NetBSD__*/
@@ -49,6 +50,8 @@
     #include <sys/user.h>
   #endif
   #include <sys/mman.h>
+#elif defined __HAIKU__
+  #include <kernel/image.h>
 #endif
 
 #include <dlfcn.h>
@@ -230,6 +233,18 @@ static void __tokencap_load_mappings(void) {
   }
 
   munmap(buf, len);
+  #elif defined __HAIKU__
+  image_info ii;
+  int32_t group = 0;
+
+  while (get_next_image_info(0, &group, &ii) == B_OK) {
+
+    __tokencap_ro[__tokencap_ro_cnt].st = ii.text; 
+    __tokencap_ro[__tokencap_ro_cnt].en = ((char *)ii.text) + ii.text_size; 
+
+      if (++__tokencap_ro_cnt == MAX_MAPPINGS) break;
+
+  }
 #endif
 
 }