From dfcf7097ce35fb0d2a7f8ca6df60d9d27ac075ea Mon Sep 17 00:00:00 2001
From: Haoliang Zhu <2298000766@qq.com>
Date: Tue, 1 Oct 2024 21:50:33 +0800
Subject: [PATCH] [cet] Bug fix: Correct Errors in CMakeLists.txt

1. The `cet_ioctl` is a kernel module, and should not use the `make install` command for installation. Remove it from CMakeLists.txt.
2. The `-no-pie` option is a linker parameter.
3. The `quick_test` `shstk_huge_page` and `glibc_shstk_test` should utilize `CETFLAGS`.

Signed-off-by: Haoliang Zhu <2298000766@qq.com>
---
 BM/cet/CMakeLists.txt | 29 +++++++++--------------------
 1 file changed, 9 insertions(+), 20 deletions(-)

diff --git a/BM/cet/CMakeLists.txt b/BM/cet/CMakeLists.txt
index 56fc690c..23dfcb18 100644
--- a/BM/cet/CMakeLists.txt
+++ b/BM/cet/CMakeLists.txt
@@ -9,19 +9,21 @@ project(cet)
 # Set the build output directory
 set(BUILD_OUTPUT ${CMAKE_CURRENT_BINARY_DIR})
 
-# Set the installation prefix 
+# Set the installation prefix
 set(CMAKE_INSTALL_PREFIX /usr/local/bin)
 
 # Set the flags
-set(CETFLAGS -O0 -fcf-protection=full -mshstk -fno-stack-check -fno-stack-protector -no-pie)
-set(SHSTKFLAGS -O0 -mshstk -fcf-protection=return -fno-stack-check -fno-stack-protector -no-pie)
-set(NOCETFLAGS -O0 -fcf-protection=none -mshstk -fno-stack-check -fno-stack-protector -no-pie)
+set(CETFLAGS -O0 -fcf-protection=full -mshstk -fno-stack-check -fno-stack-protector)
+set(SHSTKFLAGS -O0 -mshstk -fcf-protection=return -fno-stack-check -fno-stack-protector)
+set(NOCETFLAGS -O0 -fcf-protection=none -mshstk -fno-stack-check -fno-stack-protector)
+
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -no-pie")
 
 # Get the gcc version. If the version is greater than or equal to 8, build the CET programs.
 execute_process(COMMAND gcc --version OUTPUT_VARIABLE GCC_VERSION)
 string(REGEX MATCH "([0-9]+)\\." GCC_VER_MAJOR ${GCC_VERSION})
 if(GCC_VER_MAJOR GREATER_EQUAL 8)
-    set(BIN shstk_alloc test_shadow_stack quick_test wrss shstk_huge_page 
+    set(BIN shstk_alloc test_shadow_stack quick_test wrss shstk_huge_page
         shstk_unlock_test shstk_cp cet_app glibc_shstk_test shstk_cpu shstk_cpu_legacy)
 else()
     message(WARNING "GCC version is less than 8, skipping build cet.")
@@ -32,28 +34,15 @@ endif()
 set(KER_SRC "/lib/modules/${CMAKE_SYSTEM_VERSION}/build")
 set(DRIVER_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cet_driver")
 
-if(EXISTS ${KER_SRC})
-    list(APPEND BIN cet_ioctl)
-else()
-    message(WARNING "Kernel source path not found, skipping build cet_ioctl.")
-endif()
-
 # Add the executable
 foreach(target ${BIN})
-    if(${target} STREQUAL "cet_ioctl")
-        # cet_ioctl need to be built in the kernel source directory
-        add_custom_target(${target}
-            COMMAND ${CMAKE_MAKE_PROGRAM} -C ${KER_SRC} M=${DRIVER_PATH} modules
-            WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-        )
-    elseif(${target} STREQUAL "cet_app")
-        # cet_app need to be built with the cet_driver
+    if(${target} STREQUAL "cet_app")
         add_executable(${target} cet_driver/cet_app.c)
         target_include_directories(${target} PRIVATE cet_driver)
     else()
         add_executable(${target} ${target}.c)
         if(${target} MATCHES "quick_test|shstk_huge_page|glibc_shstk_test")
-            target_compile_options(${target} PRIVATE ${SHSTKFLAGS})
+            target_compile_options(${target} PRIVATE ${CETFLAGS})
         else()
             target_compile_options(${target} PRIVATE ${NOCETFLAGS})
         endif()