[PATCH] [dfsan] Add custom function for dl_iterate_phdr.

[Peter Collingbourne]

    - Check the label of the callback arguments

Hi eugenis,

http://llvm-reviews.chandlerc.com/D1505

CHANGE SINCE LAST DIFF
  http://llvm-reviews.chandlerc.com/D1505?vs=3737&id=3830#toc

BRANCH
  dfsan-trampoline2

ARCANIST PROJECT
  compiler-rt

Files:
  lib/dfsan/dfsan_custom.cc
  lib/dfsan/done_abilist.txt
  lib/dfsan/lit_tests/custom.c

Index: lib/dfsan/dfsan_custom.cc
===================================================================
--- lib/dfsan/dfsan_custom.cc
+++ lib/dfsan/dfsan_custom.cc
@@ -19,6 +19,8 @@
 
 #include <ctype.h>
 #include <dlfcn.h>
+#include <link.h>
+#include <pthread.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
@@ -272,4 +274,69 @@
   return (void *)map;
 }
 
+struct pthread_create_info {
+  void *(*start_routine_trampoline)(void *, void *, dfsan_label, dfsan_label *);
+  void *start_routine;
+  void *arg;
+};
+
+static void *pthread_create_cb(void *p) {
+  pthread_create_info pci(*(pthread_create_info *)p);
+  free(p);
+  dfsan_label ret_label;
+  return pci.start_routine_trampoline(pci.start_routine, pci.arg, 0,
+                                      &ret_label);
+}
+
+SANITIZER_INTERFACE_ATTRIBUTE int __dfsw_pthread_create(
+    pthread_t *thread, const pthread_attr_t *attr,
+    void *(*start_routine_trampoline)(void *, void *, dfsan_label,
+                                      dfsan_label *),
+    void *start_routine, void *arg, dfsan_label thread_label,
+    dfsan_label attr_label, dfsan_label start_routine_label,
+    dfsan_label arg_label, dfsan_label *ret_label) {
+  pthread_create_info *pci =
+      (pthread_create_info *)malloc(sizeof(pthread_create_info));
+  pci->start_routine_trampoline = start_routine_trampoline;
+  pci->start_routine = start_routine;
+  pci->arg = arg;
+  int rv = pthread_create(thread, attr, pthread_create_cb, (void *)pci);
+  if (rv != 0)
+    free(pci);
+  *ret_label = 0;
+  return rv;
+}
+
+struct dl_iterate_phdr_info {
+  int (*callback_trampoline)(void *callback, struct dl_phdr_info *info,
+                             size_t size, void *data, dfsan_label info_label,
+                             dfsan_label size_label, dfsan_label data_label,
+                             dfsan_label *ret_label);
+  void *callback;
+  void *data;
+};
+
+int dl_iterate_phdr_cb(struct dl_phdr_info *info, size_t size, void *data) {
+  dl_iterate_phdr_info *dipi = (dl_iterate_phdr_info *)data;
+  dfsan_set_label(0, *info);
+  dfsan_set_label(0, (void *)info->dlpi_name, strlen(info->dlpi_name) + 1);
+  dfsan_set_label(0, (void *)info->dlpi_phdr,
+                  sizeof(*info->dlpi_phdr) * info->dlpi_phnum);
+  dfsan_label ret_label;
+  return dipi->callback_trampoline(dipi->callback, info, size, dipi->data, 0, 0,
+                                   0, &ret_label);
+}
+
+SANITIZER_INTERFACE_ATTRIBUTE int __dfsw_dl_iterate_phdr(
+    int (*callback_trampoline)(void *callback, struct dl_phdr_info *info,
+                               size_t size, void *data, dfsan_label info_label,
+                               dfsan_label size_label, dfsan_label data_label,
+                               dfsan_label *ret_label),
+    void *callback, void *data, dfsan_label callback_label,
+    dfsan_label data_label, dfsan_label *ret_label) {
+  dl_iterate_phdr_info dipi = { callback_trampoline, callback, data };
+  *ret_label = 0;
+  return dl_iterate_phdr(dl_iterate_phdr_cb, &dipi);
+}
+
 }
Index: lib/dfsan/done_abilist.txt
===================================================================
--- lib/dfsan/done_abilist.txt
+++ lib/dfsan/done_abilist.txt
@@ -102,6 +102,8 @@
 fun:read=custom
 fun:pread=custom
 fun:clock_gettime=custom
+fun:pthread_create=custom
+fun:dl_iterate_phdr=custom
 
 # TODO: custom
 fun:snprintf=discard
Index: lib/dfsan/lit_tests/custom.c
===================================================================
--- lib/dfsan/lit_tests/custom.c
+++ lib/dfsan/lit_tests/custom.c
@@ -3,15 +3,31 @@
 
 // Tests custom implementations of various libc functions.
 
+#define _GNU_SOURCE
 #include <sanitizer/dfsan_interface.h>
 #include <assert.h>
+#include <link.h>
+#include <pthread.h>
 #include <string.h>
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
 
+void *ptcb(void *p) {
+  assert(p == (void *)1);
+  return (void *)2;
+}
+
+int dlcb(struct dl_phdr_info *info, size_t size, void *data) {
+  assert(data == (void *)3);
+  assert(dfsan_get_label((uintptr_t)info) == 0);
+  assert(dfsan_get_label(size) == 0);
+  assert(dfsan_get_label((uintptr_t)data) == 0);
+  return 0;
+}
+
 int main(void) {
   int i = 1;
   dfsan_label i_label = dfsan_create_label("i", 0);
@@ -125,5 +141,13 @@
   assert(dfsan_get_label(buf[0]) == 0);
   assert(dfsan_get_label(buf[15]) == 0);
 
+  pthread_t pt;
+  pthread_create(&pt, 0, ptcb, (void *)1);
+  void *cbrv;
+  pthread_join(pt, &cbrv);
+  assert(cbrv == (void *)2);
+
+  dl_iterate_phdr(dlcb, (void *)3);
+
   return 0;
 }
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D1505.2.patch
Type: text/x-patch
Size: 4625 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20130827/e4f7f0c9/attachment.bin>