Renaming files. (#85) Making the old filenames more distinctive now when new examples exist. Fixing README.
diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt index c6391be..578c14b 100644 --- a/demos/CMakeLists.txt +++ b/demos/CMakeLists.txt
@@ -21,9 +21,9 @@ # Support library add_library(safeside cache_sidechannel.cc instr.cc utils.cc) -# Spectre V1 PHT -- bounds check bypass -add_executable(spectre_v1 spectre_v1.cc) -target_link_libraries(spectre_v1 safeside) +# Spectre V1 PHT SA -- mistraining PHT in the same address space +add_executable(spectre_v1_pht_sa spectre_v1_pht_sa.cc) +target_link_libraries(spectre_v1_pht_sa safeside) # Spectre V1 BTB SA -- mistraining BTB in the same address space add_executable(spectre_v1_btb_sa spectre_v1_btb_sa.cc) @@ -33,9 +33,9 @@ add_executable(spectre_v4 spectre_v4.cc) target_link_libraries(spectre_v4 safeside) -# Cyclic Ret2Spec -- rewriting the RSB -add_executable(ret2spec_cyclic ret2spec_cyclic.cc) -target_link_libraries(ret2spec_cyclic safeside) +# Ret2Spec -- rewriting the RSB using recursion in the same address space +add_executable(ret2spec_sa ret2spec_sa.cc) +target_link_libraries(ret2spec_sa safeside) if(${CMAKE_SYSTEM_NAME} MATCHES "^(Linux)$") # Spectre V1 BTB CA - mistraining BTB from another address space @@ -45,10 +45,11 @@ if((${CMAKE_SYSTEM_NAME} MATCHES "^(Linux)|(Darwin)$") AND (${CMAKE_SYSTEM_PROCESSOR} MATCHES "^(i.86)|(x86_64)|(aarch64)$")) - # Ret2Spec -- speculative execution using return stack buffers - add_executable(ret2spec ret2spec.cc) - target_compile_options(ret2spec PRIVATE -fomit-frame-pointer) - target_link_libraries(ret2spec safeside) + # Ret2Spec -- speculative execution using return stack buffers creating a + # call-ret disparity by inline assembly + add_executable(ret2spec_callret_disparity ret2spec_callret_disparity.cc) + target_compile_options(ret2spec_callret_disparity PRIVATE -fomit-frame-pointer) + target_link_libraries(ret2spec_callret_disparity safeside) endif() if((${CMAKE_SYSTEM_NAME} MATCHES "^(Linux)$") AND @@ -103,8 +104,8 @@ if((${CMAKE_SYSTEM_NAME} MATCHES "^(Linux)$") AND (${CMAKE_SYSTEM_PROCESSOR} MATCHES "^(i.86)|(x86_64)$")) # Speculation over hardware breakpoint trap (read watcher) - add_executable(speculation_over_hw_breakpoint speculation_over_hw_breakpoint.cc) - target_link_libraries(speculation_over_hw_breakpoint safeside) + add_executable(speculation_over_read_hw_breakpoint speculation_over_read_hw_breakpoint.cc) + target_link_libraries(speculation_over_read_hw_breakpoint safeside) # Speculation over hardware breakpoint fault (execution watcher) add_executable(speculation_over_exec_hw_breakpoint speculation_over_exec_hw_breakpoint.cc)
diff --git a/demos/README.md b/demos/README.md index c744355..2074545 100644 --- a/demos/README.md +++ b/demos/README.md
@@ -9,14 +9,18 @@ # Everything should be built now. -./build/demos/spectre_v1 +./build/demos/spectre_v1_pht_sa + +./build/demos/spectre_v1_btb_ca # You need to load the kernel module before running this sudo ./build/demos/meltdown ./build/demos/spectre_v4 -./build/demos/ret2spec +./build/demos/ret2spec_sa + +etc. ``` ## Tested environments
diff --git a/demos/ret2spec.cc b/demos/ret2spec_callret_disparity.cc similarity index 100% rename from demos/ret2spec.cc rename to demos/ret2spec_callret_disparity.cc
diff --git a/demos/ret2spec_cyclic.cc b/demos/ret2spec_sa.cc similarity index 100% rename from demos/ret2spec_cyclic.cc rename to demos/ret2spec_sa.cc
diff --git a/demos/spectre_v1.cc b/demos/spectre_v1_pht_sa.cc similarity index 100% rename from demos/spectre_v1.cc rename to demos/spectre_v1_pht_sa.cc
diff --git a/demos/speculation_over_hw_breakpoint.cc b/demos/speculation_over_read_hw_breakpoint.cc similarity index 100% rename from demos/speculation_over_hw_breakpoint.cc rename to demos/speculation_over_read_hw_breakpoint.cc