Push 2024 06 30

.github/workflows/ci-fuzz-micro.yml

@@ -0,0 +1,47 @@
+name: fuzz-micro-job
+
+on:
+  push:
+    branches: [ '**' ]
+  pull_request:
+    branches: [ '**' ]
+
+permissions:
+  contents: read
+
+jobs:
+  fuzz:
+    runs-on: ci-test
+    if: ${{ github.repository != 'intel/pcm' }}
+
+    steps:
+    - name: Harden Runner
+      uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
+      with:
+        egress-policy: audit
+
+    - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      with:
+        submodules: recursive
+
+    - name: Build and test
+      run: |
+        cmake --version
+        set -o pipefail
+        mkdir build
+        cd build
+        bash ${{ github.workspace }}/tests/fuzz.sh 5 2>&1 | tee fuzz-log.txt
+        cd ..
+
+    - name: Show report
+      run: |
+        cat build/report.txt
+        echo "Fuzzing completed"
+
+    - name: upload-artifact
+      uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+      with:
+        name: fuzz-log-${{ github.sha }}
+        path: "build/fuzz-log.txt"
+
+

.github/workflows/ci-fuzz-short.yml

@@ -0,0 +1,46 @@
+name: fuzz-short-job
+
+on:
+  # manual triggering
+  workflow_dispatch:
+
+
+permissions:
+  contents: read
+
+jobs:
+  fuzz:
+    runs-on: ci-test
+    if: ${{ github.repository != 'intel/pcm' }}
+
+    steps:
+    - name: Harden Runner
+      uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
+      with:
+        egress-policy: audit
+
+    - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      with:
+        submodules: recursive
+
+    - name: Build and test
+      run: |
+        cmake --version
+        set -o pipefail
+        mkdir build
+        cd build
+        bash ${{ github.workspace }}/tests/fuzz.sh 10 2>&1 | tee fuzz-log.txt
+        cd ..
+
+    - name: Show report
+      run: |
+        cat build/report.txt
+        echo "Fuzzing completed"
+
+    - name: upload-artifact
+      uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+      with:
+        name: fuzz-log-${{ github.sha }}
+        path: "build/fuzz-log.txt"
+
+

.github/workflows/ci-fuzz.yml

@@ -32,7 +32,7 @@ jobs:
         set -o pipefail
         mkdir build
         cd build
-        sh ${{ github.workspace }}/tests/fuzz.sh 2>&1 | tee fuzz-log.txt
+        bash ${{ github.workspace }}/tests/fuzz.sh 300 2>&1 | tee fuzz-log.txt
         cd ..
 
     - name: Show report

.github/workflows/ci-test.yml

@@ -37,7 +37,7 @@ jobs:
     - name: Test
       run: |
         set -o pipefail
-        sh ${{ github.workspace }}/tests/test.sh 2>&1 | tee test-log.txt
+        bash ${{ github.workspace }}/tests/test.sh 2>&1 | tee test-log.txt
 
     - name: upload-artifact
       uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3

CMakeLists.txt

@@ -82,9 +82,18 @@ if(UNIX)  # APPLE, LINUX, FREE_BSD
     elseif()
          set (PCM_DYNAMIC "")
     endif()
-    set(CMAKE_CXX_FLAGS_RELEASE "${PCM_OPTIONAL_FLAGS} -O3 ${PCM_DYNAMIC}")
-    set(CMAKE_CXX_FLAGS_DEBUG "${PCM_OPTIONAL_FLAGS} -O0 -g ${PCM_DYNAMIC}")
-    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${PCM_OPTIONAL_FLAGS} -O3 -g ${PCM_DYNAMIC}")
+    set(PCM_HARDENING_FLAGS "-fPIE -fstack-protector -D_FORTIFY_SOURCE=2 -ftrapv -fsanitize=address -fwrapv -fno-delete-null-pointer-checks -fno-strict-overflow -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer")
+    if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5)
+        message(WARNING "Old gcc compiler (version < 5), -fsanitize=undefined option is not supported.")
+    elseif()
+        set(PCM_HARDENING_FLAGS "${PCM_HARDENING_FLAGS} -fsanitize=undefined")
+    endif()
+    set(PCM_LINKER_HARDENING_FLAGS "-fsanitize=address")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${PCM_LINKER_HARDENING_FLAGS}")
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${PCM_LINKER_HARDENING_FLAGS}")
+    set(CMAKE_CXX_FLAGS_RELEASE "${PCM_OPTIONAL_FLAGS} -O3 ${PCM_DYNAMIC} ${PCM_HARDENING_FLAGS}")
+    set(CMAKE_CXX_FLAGS_DEBUG "${PCM_OPTIONAL_FLAGS} -O0 -g ${PCM_DYNAMIC} ${PCM_HARDENING_FLAGS}")
+    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${PCM_OPTIONAL_FLAGS} -O3 -g ${PCM_DYNAMIC} ${PCM_HARDENING_FLAGS}")
     if(FREE_BSD)
         set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -lexecinfo")
         set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -lexecinfo")
@@ -94,6 +103,10 @@ if(UNIX)  # APPLE, LINUX, FREE_BSD
     set(CMAKE_C_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
     set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
 
+    message(STATUS "CMAKE_CXX_FLAGS_RELEASE: ${CMAKE_CXX_FLAGS_RELEASE}")
+    message(STATUS "CMAKE_CXX_FLAGS_DEBUG: ${CMAKE_CXX_FLAGS_DEBUG}")
+    message(STATUS "CMAKE_CXX_FLAGS_RELWITHDEBINFO: ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
+
 endif(UNIX)
 
 if(FUZZ)

_service

@@ -0,0 +1,12 @@
+<services>
+  <service name="download_url">
+    <param name="host">github.com</param>
+    <param name="protocol">https</param>
+    <param name="path">/intel/pcm/archive/master.zip</param>
+  </service>
+  <service name="download_url">
+    <param name="host">github.com</param>
+    <param name="protocol">https</param>
+    <param name="path">/intel/pcm/archive/master.tar.gz</param>
+  </service>
+<service name="download_url"><param name="host">raw.githubusercontent.com</param><param name="protocol">https</param><param name="path">/intel/pcm/master/pcm.spec</param></service></services>

src/CMakeLists.txt

@@ -1,10 +1,13 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright (c) 2022, Intel Corporation
 
+include(FindOpenSSL)
 
 # All pcm-* executables
 set(PROJECT_NAMES pcm pcm-numa pcm-latency pcm-power pcm-msr pcm-memory pcm-tsx pcm-pcie pcm-core pcm-iio pcm-lspci pcm-pcicfg pcm-mmio pcm-tpmi pcm-raw pcm-accel)
 
+set(MINIMUM_OPENSSL_VERSION 1.1.1)
+
 file(GLOB COMMON_SOURCES pcm-accel-common.cpp msr.cpp cpucounters.cpp pci.cpp mmio.cpp tpmi.cpp pmt.cpp bw.cpp utils.cpp topology.cpp debug.cpp threadpool.cpp uncore_pmu_discovery.cpp)
 
 if (APPLE)
@@ -32,8 +35,11 @@ if(UNIX)  # LINUX, FREE_BSD, APPLE
       $<$<CONFIG:RelWithDebInfo>:PCM_SILENT>
     )
 
+    target_compile_options(PCM_STATIC_SILENT PRIVATE "-fPIC")
+
     # libpcm.so
     add_library(PCM_SHARED SHARED pcm-core.cpp)
+    target_compile_options(PCM_SHARED PRIVATE -DPCM_SHARED_LIBRARY=1)
     # PCM_SILENT in Release* for pcm-core.cpp
     target_compile_definitions(PCM_SHARED PRIVATE
       $<$<CONFIG:Release>:PCM_SILENT>
@@ -44,6 +50,8 @@ if(UNIX)  # LINUX, FREE_BSD, APPLE
         add_subdirectory(MacMSRDriver)
         include_directories("${CMAKE_SOURCE_DIR}/src/MacMSRDriver") # target_include_directories doesn't work
         target_link_libraries(PCM_SHARED PRIVATE PCM_STATIC_SILENT PcmMsr Threads::Threads)
+    elseif(LINUX)
+        target_link_libraries(PCM_SHARED PRIVATE PCM_STATIC_SILENT Threads::Threads asan)
     else()
         target_link_libraries(PCM_SHARED PRIVATE PCM_STATIC_SILENT Threads::Threads)
     endif()
@@ -145,9 +153,14 @@ foreach(PROJECT_NAME ${PROJECT_NAMES})
       else()
         message(STATUS "Compiling with SSL support, requires libssl-dev or openssl-devel or libopenssl-devel or libopenssl-dev package installed")
         message(STATUS "To disable SSL support, use -DNO_SSL=1 option")
-        find_package(OpenSSL REQUIRED)
-        target_compile_options(${PROJECT_NAME} PRIVATE "-DUSE_SSL")
-        set(LIBS ${LIBS} OpenSSL::SSL OpenSSL::Crypto)
+        find_package(OpenSSL ${MINIMUM_OPENSSL_VERSION} QUIET)
+        if(OPENSSL_FOUND)
+          message(STATUS "OpenSSL version ${OPENSSL_VERSION} >= ${MINIMUM_OPENSSL_VERSION}, OpenSSL support enabled")
+          target_compile_options(${PROJECT_NAME} PRIVATE "-DUSE_SSL")
+          set(LIBS ${LIBS} OpenSSL::SSL OpenSSL::Crypto)
+        else()
+          message(STATUS "OpenSSL support has been disabled, the version is less than ${MINIMUM_OPENSSL_VERSION}")
+        endif()
       endif()
       file(READ pcm-sensor-server.service.in SENSOR_SERVICE_IN)
       string(REPLACE "@@CMAKE_INSTALL_SBINDIR@@" "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_SBINDIR}" SENSOR_SERVICE "${SENSOR_SERVICE_IN}")

src/cpuasynchcounter.h

@@ -77,10 +77,10 @@ class AsynchronCounterState {
         {
             std::cerr << "PCM Error in ~AsynchronCounterState(). Exception " << e.what() << "\n";
         }
-        delete[] cstates1;
-        delete[] cstates2;
-        delete[] skstates1;
-        delete[] skstates2;
+        deleteAndNullifyArray(cstates1);
+        deleteAndNullifyArray(cstates2);
+        deleteAndNullifyArray(skstates1);
+        deleteAndNullifyArray(skstates2);
     }
 
     uint32 getNumCores()

src/cpucounters.cpp

@@ -513,7 +513,7 @@ bool PCM::isRDTDisabled() const
             flag = 0;
         }
 #ifdef _MSC_VER
-        free(env);
+        freeAndNullify(env);
 #endif
     }
     return flag > 0;
@@ -1204,7 +1204,7 @@ bool PCM::discoverSystemTopology()
 
     while (res == FALSE)
     {
-        delete[] slpi;
+        deleteAndNullifyArray(slpi);
 
         if (GetLastError() == ERROR_INSUFFICIENT_BUFFER)
         {
@@ -1263,7 +1263,7 @@ bool PCM::discoverSystemTopology()
         socketIdMap[entry.socket] = 0;
     }
 
-    delete[] base_slpi;
+    deleteAndNullifyArray(base_slpi);
 
 #else
     // for Linux, Mac OS, FreeBSD and DragonFlyBSD
@@ -1374,7 +1374,7 @@ bool PCM::discoverSystemTopology()
             return false;                                                                                  \
         }                                                                                                  \
         ret_value = convertUnknownToInt(size, pParam);                                                     \
-        free(pParam);                                                                                      \
+        freeAndNullify(pParam);                                                                            \
     }
 // End SAFE_SYSCTLBYNAME
 
@@ -3307,7 +3307,7 @@ PCM::~PCM()
     {
         destroyMSR();
         instance = NULL;
-        delete systemTopology;
+        deleteAndNullify(systemTopology);
     }
 }
 
@@ -7160,7 +7160,7 @@ PciHandleType * ServerUncorePMUs::createIntelPerfMonDevice(uint32 groupnr_, int3
 
         if(vendor_id == PCM_INTEL_PCI_VENDOR_ID) return handle;
 
-        delete handle;
+        deleteAndNullify(handle);
     }
     return NULL;
 }
@@ -8600,6 +8600,18 @@ ServerUncorePMUs::~ServerUncorePMUs()
 
 void ServerUncorePMUs::programServerUncoreMemoryMetrics(const ServerUncoreMemoryMetrics & metrics, const int rankA, const int rankB)
 {
+    switch (metrics)
+    {
+        case PartialWrites:
+        case Pmem:
+        case PmemMemoryMode:
+        case PmemMixedMode:
+            break;
+        default:
+            std::cerr << "PCM Error: unknown memory metrics: " << metrics << "\n";
+            return;
+    }
+
     PCM * pcm = PCM::getInstance();
     uint32 MCCntConfig[4] = {0,0,0,0};
     uint32 EDCCntConfig[4] = {0,0,0,0};
@@ -8695,6 +8707,16 @@ void ServerUncorePMUs::programServerUncoreMemoryMetrics(const ServerUncoreMemory
             }
         }
     } else {
+        if (rankA < 0 || rankA > 7)
+        {
+            std::cerr << "PCM Error: invalid rankA value: " << rankA << "\n";
+            return;
+        }
+        if (rankB < 0 || rankB > 7)
+        {
+            std::cerr << "PCM Error: invalid rankB value: " << rankB << "\n";
+            return;
+        }
         switch(cpu_model)
         {
         case PCM::IVYTOWN:
@@ -9742,7 +9764,7 @@ PciHandleType * getDeviceHandle(uint32 vendorId, uint32 deviceId)
                         const uint32 did = (value >> 16) & 0xffff;
                         if (vid == vendorId && did == deviceId)
                             return h;
-                        delete h;
+                        deleteAndNullify(h);
                     }
                 }
             }
@@ -9792,7 +9814,7 @@ uint32 PCM::getMaxNumOfCBoxesInternal() const
                 num = (uint32)weight32(value);
                 h->read32(0xa0, &value);
                 num += (uint32)weight32(value);
-                delete h;
+                deleteAndNullify(h);
             }
             else
             {
@@ -10457,8 +10479,8 @@ CounterWidthExtender::CounterWidthExtender(AbstractRawCounter * raw_counter_, ui
 }
 CounterWidthExtender::~CounterWidthExtender()
 {
-    delete UpdateThread;
-    if (raw_counter) delete raw_counter;
+    deleteAndNullify(UpdateThread);
+    deleteAndNullify(raw_counter);
 }
 
 

src/daemon/daemon.cpp

@@ -89,8 +89,8 @@ namespace PCMDaemon {
 
     Daemon::~Daemon()
     {
-        delete[] serverUncoreCounterStatesBefore_;
-        delete[] serverUncoreCounterStatesAfter_;
+        deleteAndNullifyArray(serverUncoreCounterStatesBefore_);
+        deleteAndNullifyArray(serverUncoreCounterStatesAfter_);
     }
 
     void Daemon::setupPCM()

src/memoptest.cpp

@@ -132,7 +132,7 @@ int main(int argc, char * argv[])
         cout << "Bandwidth: " << (sizeof(T) * nelements * niter) / ((after_ts - before_ts) * 1024 * 1024) << " MByte/sec\n" << std::flush;
     }
 
-    delete[] vector;
+    deleteAndNullifyArray(vector);
 
     return 0;
 }

src/msr.cpp

@@ -126,8 +126,7 @@ MsrHandle::~MsrHandle()
     MsrHandle::num_handles--;
     if (MsrHandle::num_handles == 0)
     {
-        delete driver;
-        driver = NULL;
+        deleteAndNullify(driver);
     }
 }
 
@@ -228,14 +227,15 @@ MsrHandle::MsrHandle(uint32 cpu) : fd(-1), cpu_id(cpu)
         writesEnabled = true;
     }
     char * path = new char[200];
+    if (!path) throw std::runtime_error("Allocation of 200 bytes failed.");
     snprintf(path, 200, "/dev/cpu/%d/msr", cpu);
     int handle = ::open(path, O_RDWR);
     if (handle < 0)
     {   // try Android msr device path
         snprintf(path, 200, "/dev/msr%d", cpu);
         handle = ::open(path, O_RDWR);
     }
-    delete[] path;
+    deleteAndNullifyArray(path);
     if (handle < 0)
     {
          std::cerr << "PCM Error: can't open MSR handle for core " << cpu << " (" << strerror(errno) << ")\n";