Add DSMIL build option and port DSMIL passes

Author: Your Name

dsmil/CMakeLists.txt

@@ -0,0 +1,15 @@
+cmake_minimum_required(VERSION 3.20.0)
+
+project(DSMIL LANGUAGES C CXX)
+
+include(GNUInstallDirs)
+include(AddLLVM)
+
+add_subdirectory(lib)
+
+install(
+  DIRECTORY include/
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dsmil
+  FILES_MATCHING
+  PATTERN "*.h"
+)

dsmil/lib/CMakeLists.txt

@@ -0,0 +1,2 @@
+add_subdirectory(Passes)
+add_subdirectory(Runtime)

dsmil/lib/Passes/CMakeLists.txt

@@ -0,0 +1,35 @@
+set(DSMIL_PASS_SOURCES
+  DsmilBFTPass.cpp
+  DsmilBlueRedPass.cpp
+  DsmilConstantTimePass.cpp
+  DsmilCrossDomainPass.cpp
+  DsmilEdgeSecurityPass.cpp
+  DsmilFuzzExportPass.cpp
+  DsmilJADC2Pass.cpp
+  DsmilMPEPass.cpp
+  DsmilMissionPolicyPass.cpp
+  DsmilNuclearSuretyPass.cpp
+  DsmilRadioBridgePass.cpp
+  DsmilStealthPass.cpp
+  DsmilTelemetryCheckPass.cpp
+  DsmilThreatSignaturePass.cpp
+)
+
+add_llvm_library(DsmilPasses MODULE
+  ${DSMIL_PASS_SOURCES}
+  PLUGIN_TOOL opt
+)
+
+target_include_directories(DsmilPasses PRIVATE
+  ${LLVM_MAIN_SRC_DIR}/../dsmil/include
+)
+
+set_target_properties(DsmilPasses PROPERTIES
+  OUTPUT_NAME "DsmilPasses"
+)
+
+install(TARGETS DsmilPasses
+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+)

dsmil/lib/Passes/DsmilBFTPass.cpp

@@ -32,7 +32,9 @@
 #include "llvm/IR/Instructions.h"
 #include "llvm/IR/IRBuilder.h"
 #include "llvm/IR/Attributes.h"
-#include "llvm/Pass.h"
+#include "llvm/IR/PassManager.h"
+#include "llvm/Passes/PassBuilder.h"
+#include "llvm/Passes/PassPlugin.h"
 #include "llvm/Support/raw_ostream.h"
 #include <unordered_map>
 #include <string>
@@ -217,7 +219,7 @@ void DsmilBFTPass::insertBFTCall(Function *F, BFTUpdateType Type) {
             BFTFunc = M->getOrInsertFunction(
                 "dsmil_bft_send_status",
                 Type::getInt32Ty(Ctx),
-                Type::getInt8PtrTy(Ctx)
+                PointerType::get(Type::getInt8Ty(Ctx), 0)
             );
             break;
 
@@ -226,7 +228,7 @@ void DsmilBFTPass::insertBFTCall(Function *F, BFTUpdateType Type) {
             BFTFunc = M->getOrInsertFunction(
                 "dsmil_bft_send_friendly",
                 Type::getInt32Ty(Ctx),
-                Type::getInt8PtrTy(Ctx)
+                PointerType::get(Type::getInt8Ty(Ctx), 0)
             );
             break;
 

dsmil/lib/Passes/DsmilBlueRedPass.cpp

@@ -22,6 +22,8 @@
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/JSON.h"
 #include "llvm/Support/raw_ostream.h"
+#include "llvm/Passes/PassBuilder.h"
+#include "llvm/Passes/PassPlugin.h"
 #include <map>
 #include <set>
 #include <string>
@@ -204,12 +206,9 @@ class DsmilBlueRedPass : public PassInfoMixin<DsmilBlueRedPass> {
     IRBuilder<> Builder(&Entry, Entry.getFirstInsertionPt());
 
     // Create call to dsmil_red_log(hook_name, function_name)
+    auto *I8Ptr = PointerType::get(Type::getInt8Ty(Ctx), 0);
     FunctionCallee RedLogFunc = M->getOrInsertFunction(
-        "dsmil_red_log",
-        Type::getVoidTy(Ctx),
-        Type::getInt8PtrTy(Ctx),  // hook_name
-        Type::getInt8PtrTy(Ctx)   // function_name
-    );
+        "dsmil_red_log", Type::getVoidTy(Ctx), I8Ptr, I8Ptr);
 
     Value *HookNameStr = Builder.CreateGlobalStringPtr(HookName);
     Value *FuncNameStr = Builder.CreateGlobalStringPtr(F.getName());
@@ -274,11 +273,9 @@ class DsmilBlueRedPass : public PassInfoMixin<DsmilBlueRedPass> {
     IRBuilder<> Builder(&Entry, Entry.getFirstInsertionPt());
 
     // Create call to dsmil_red_scenario(vuln_type)
+    auto *I8Ptr = PointerType::get(Type::getInt8Ty(Ctx), 0);
     FunctionCallee ScenarioFunc = M->getOrInsertFunction(
-        "dsmil_red_scenario",
-        Type::getInt1Ty(Ctx),  // Returns bool
-        Type::getInt8PtrTy(Ctx)  // scenario_name
-    );
+        "dsmil_red_scenario", Type::getInt1Ty(Ctx), I8Ptr);
 
     Value *VulnTypeStr = Builder.CreateGlobalStringPtr(VulnType);
     Value *ShouldInject = Builder.CreateCall(ScenarioFunc, {VulnTypeStr});
@@ -385,7 +382,7 @@ class DsmilBlueRedPass : public PassInfoMixin<DsmilBlueRedPass> {
     std::error_code EC;
     raw_fd_ostream OS(OutputPath, EC);
     if (!EC) {
-      OS << formatv("{0:2}", Value(std::move(Report)));
+      OS << formatv("{0:2}", json::Value(std::move(Report)));
       OS.close();
     }
   }

dsmil/lib/Passes/DsmilConstantTimePass.cpp

@@ -21,6 +21,8 @@
 #include "llvm/IR/IntrinsicInst.h"
 #include "llvm/IR/Module.h"
 #include "llvm/IR/PassManager.h"
+#include "llvm/Passes/PassBuilder.h"
+#include "llvm/Passes/PassPlugin.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/raw_ostream.h"
@@ -349,8 +351,9 @@ class DsmilConstantTimePass : public PassInfoMixin<DsmilConstantTimePass> {
 
           // Shifting BY a secret amount is timing-dependent
           if (isSecretValue(BO->getOperand(1))) {
-            std::string Msg = "Variable-time instruction: shift by secret amount " +
-                              "(shift timing may depend on shift count)";
+            std::string Msg =
+                std::string("Variable-time instruction: shift by secret amount ") +
+                "(shift timing may depend on shift count)";
             Violations.emplace_back(ViolationType::VariableTimeInstruction,
                                     F.getName(), BO, Msg);
           }

dsmil/lib/Passes/DsmilCrossDomainPass.cpp

@@ -30,9 +30,12 @@
 #include "llvm/IR/Instructions.h"
 #include "llvm/IR/IRBuilder.h"
 #include "llvm/IR/Attributes.h"
-#include "llvm/Pass.h"
+#include "llvm/IR/PassManager.h"
+#include "llvm/Passes/PassBuilder.h"
+#include "llvm/Passes/PassPlugin.h"
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/Support/JSON.h"
+#include "llvm/ADT/SmallVector.h"
 #include <unordered_map>
 #include <unordered_set>
 #include <string>
@@ -78,6 +81,15 @@ std::string classificationToString(ClassificationLevel Level) {
     }
 }
 
+struct PairHash {
+    template <class T1, class T2>
+    std::size_t operator()(const std::pair<T1, T2> &p) const {
+        auto h1 = std::hash<T1>{}(p.first);
+        auto h2 = std::hash<T2>{}(p.second);
+        return h1 ^ (h2 << 1);
+    }
+};
+
 // Cross-domain transition record
 struct CrossDomainTransition {
     Function *Caller;
@@ -107,15 +119,6 @@ class DsmilCrossDomainPass : public PassInfoMixin<DsmilCrossDomainPass> {
     unsigned NumUnsafeCalls = 0;
     unsigned NumGuardsInserted = 0;
 
-    struct PairHash {
-        template <class T1, class T2>
-        std::size_t operator()(const std::pair<T1, T2> &p) const {
-            auto h1 = std::hash<T1>{}(p.first);
-            auto h2 = std::hash<T2>{}(p.second);
-            return h1 ^ (h2 << 1);
-        }
-    };
-
 public:
     PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM);
 
@@ -322,15 +325,16 @@ bool DsmilCrossDomainPass::insertCrossDomainGuards(Module &M) {
     bool Modified = false;
 
     // Get or create guard runtime function
-    FunctionType *GuardFT = FunctionType::get(
-        Type::getInt32Ty(M.getContext()),
-        {Type::getInt8PtrTy(M.getContext()),  // data
-         Type::getInt64Ty(M.getContext()),    // length
-         Type::getInt8PtrTy(M.getContext()),  // from_level
-         Type::getInt8PtrTy(M.getContext()),  // to_level
-         Type::getInt8PtrTy(M.getContext())}, // policy
-        false
-    );
+    auto *I8Ptr = PointerType::get(Type::getInt8Ty(M.getContext()), 0);
+    SmallVector<Type *, 5> ParamTys{
+        I8Ptr,                          // data
+        Type::getInt64Ty(M.getContext()), // length
+        I8Ptr,                          // from_level
+        I8Ptr,                          // to_level
+        I8Ptr                           // policy
+    };
+    FunctionType *GuardFT =
+        FunctionType::get(Type::getInt32Ty(M.getContext()), ParamTys, false);
 
     FunctionCallee GuardFunc = M.getOrInsertFunction(
         "dsmil_cross_domain_guard", GuardFT);

dsmil/lib/Passes/DsmilEdgeSecurityPass.cpp

@@ -40,7 +40,9 @@
 #include "llvm/IR/Instructions.h"
 #include "llvm/IR/IRBuilder.h"
 #include "llvm/IR/Attributes.h"
-#include "llvm/Pass.h"
+#include "llvm/IR/PassManager.h"
+#include "llvm/Passes/PassBuilder.h"
+#include "llvm/Passes/PassPlugin.h"
 #include "llvm/Support/raw_ostream.h"
 #include <unordered_map>
 #include <unordered_set>

dsmil/lib/Passes/DsmilFuzzExportPass.cpp

@@ -22,6 +22,8 @@
 #include "llvm/IR/Type.h"
 #include "llvm/IR/DerivedTypes.h"
 #include "llvm/Pass.h"
+#include "llvm/Passes/PassBuilder.h"
+#include "llvm/Passes/PassPlugin.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/FileSystem.h"
@@ -133,12 +135,7 @@ class DsmilFuzzExportPass : public PassInfoMixin<DsmilFuzzExportPass> {
     } else if (Ty->isDoubleTy()) {
       return "double";
     } else if (Ty->isPointerTy()) {
-      Type *ElementTy = Ty->getPointerElementType();
-      if (ElementTy->isIntegerTy(8)) {
-        return "bytes";  // uint8_t* = byte buffer
-      } else {
-        return typeToString(ElementTy) + "*";
-      }
+      return "pointer";
     } else if (Ty->isStructTy()) {
       return "struct";
     } else if (Ty->isArrayTy()) {

dsmil/lib/Passes/DsmilJADC2Pass.cpp

@@ -31,7 +31,10 @@
 #include "llvm/IR/Instructions.h"
 #include "llvm/IR/IRBuilder.h"
 #include "llvm/IR/Attributes.h"
+#include "llvm/IR/PassManager.h"
 #include "llvm/Pass.h"
+#include "llvm/Passes/PassBuilder.h"
+#include "llvm/Passes/PassPlugin.h"
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/Analysis/LoopInfo.h"
 #include "llvm/Analysis/CallGraph.h"