Add a prohibitedFunctions list to CFIChecks to filter the SAFECode ru…

…ntime functions from TargetLists
zhengyang92 · Jun 14, 2016 · b324534 · zhengyang92 · Jun 16, 2016 · b324534
1 parent e1986b9
commit b324534
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 10 deletions.
diff --git a/projects/safecode/include/safecode/CFIChecks.h b/projects/safecode/include/safecode/CFIChecks.h
@@ -49,6 +49,7 @@ struct CFIChecks : public ModulePass, InstVisitor<CFIChecks> {
   protected:
     // Pointer to load/store run-time check function
     Function * FunctionCheckUI;
+    static const char * const prohibitedFunctions[];
 
     // Create a global variable table for the targets of the call instruction
     GlobalVariable * createTargetTable (CallInst & CI, bool & isComplete);

diff --git a/projects/safecode/lib/CommonMemorySafety/SpecializeCMSCalls.cpp b/projects/safecode/lib/CommonMemorySafety/SpecializeCMSCalls.cpp
@@ -107,16 +107,8 @@ void SpecializeCMSCalls::specialize(Module &M, StringRef Before,
   for (Value::user_iterator UI = From->user_begin(), E = From->user_end();
         UI != E;
         ++UI) {
-    //
-    // CFIchecks pass generates a TargetList global variable which produces
-    // irrelevent users of __loadcheck and __storecheck.
-    //
-    // i8* bitcast (void (i8*, i64)* @__loadcheck to i8*)
-    // i8* bitcast (void (i8*, i64)* @__storecheck to i8*)
-    //
-    // Only call instructions are supposed to transform.
-    CallInst *CI;
-    if(!(CI = dyn_cast<CallInst>(*UI))) return;
+    // Only call instructions are supposed to exist.
+    CallInst *CI = cast<CallInst>(*UI);
 
     IRBuilder<> Builder(CI);
     SmallVector <Value*, 4> Args(To->arg_size());

diff --git a/projects/safecode/lib/InsertPoolChecks/CFIChecks.cpp b/projects/safecode/lib/InsertPoolChecks/CFIChecks.cpp
@@ -33,6 +33,26 @@ namespace {
   STATISTIC (Checks, "CFI Checks Added");
 }
 
+// All runtime checks functions should not appear in TargetList.
+const char* const CFIChecks::prohibitedFunctions[] = {
+  "__loadcheck", "__storecheck",
+  "pool_init_runtime", "pool_init_logfile"
+  "poolargvregister",
+  "pool_register", "pool_register_debug",
+  "pool_register_stack", "pool_register_stack_debug",
+  "pool_register_global", "pool_register_global_debug",
+  "pool_reregister", "pool_reregister_debug",
+  "pool_unregister", "pool_unregister_debug",
+  "poolrealloc",  "poolcheck", "poolcheckui", "poolcheck_debug", "poolcheckui_debug",
+  "poolcheckalign", "poolcheckalign_debug",
+  "boundscheck", "boundscheckui", "boundscheckui_debug", "boundscheck_debug",
+  "exactcheck2", "exactcheck2_debug", "fastlscheck", "fastlscheck_debug",
+  "pchk_getActualValue",
+  "funccheck", "funccheckui", "funccheck_debug", "funccheckui_debug",
+  "pool_shadow", "pool_unshadow",
+  "poolcheck_free", "poolcheck_freeui", "poolcheck_free_debug", "poolcheck_freeui_debug",
+};
+
 //
 // Method: createTargetTable()
 //
@@ -112,6 +132,27 @@ CFIChecks::createTargetTable (CallInst & CI, bool & isComplete) {
             continue;
           }
 
+          //
+          // Do not include functions in the prohibitedFunctions array, or functions
+          // with __sc_bb_ or __sc_dbg_ prefix.
+          //
+          if (Target->hasName()) {
+            StringRef Name = Target->getName();
+            if(Name.find("__sc_bb_") || Name.find("__sc_dbg_")) continue;
+
+            bool isMatched = false;
+            for (size_t i = 0; i < sizeof(prohibitedFunctions)/sizeof(prohibitedFunctions[0]); i++)
+            {
+              if (Name == prohibitedFunctions[i])
+              {
+                isMatched = true;
+                break;
+              }
+            }
+            if(isMatched) continue;
+          }
+
+
           //
           // Do not include functions with available externally linkage.  These
           // functions are never emitted into the final executable.