diff --git a/.github/workflows/test-sync.yml b/.github/workflows/test-sync.yml index 097e4db..e55686e 100644 --- a/.github/workflows/test-sync.yml +++ b/.github/workflows/test-sync.yml @@ -124,6 +124,49 @@ jobs: build/*.log build/data/ + sync-test-ubuntu-ubsan: + + timeout-minutes: 30 + runs-on: ubuntu-22.04 + + steps: + - name: Install dependencies + run: | + sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test + sudo apt update + sudo apt install -y git build-essential cmake libuv1-dev libzmq3-dev libsodium-dev libpgm-dev libnorm-dev libgss-dev libcurl4-openssl-dev libidn2-0-dev gcc-12 g++-12 + + - name: Checkout repository + uses: actions/checkout@v3 + with: + submodules: true + + - name: Build p2pool + run: | + mkdir build + cd build + cmake .. -DDEV_TEST_SYNC=ON -DDEV_WITH_UBSAN=ON -DCMAKE_C_COMPILER=gcc-12 -DCMAKE_CXX_COMPILER=g++-12 + make -j$(nproc) + + - name: Run p2pool + timeout-minutes: 20 + run: | + cd build + mkdir data + python ../tests/src/stratum_dummy.py stratum_dummy1.log & + python ../tests/src/stratum_dummy.py stratum_dummy2.log & + python ../tests/src/stratum_dummy.py stratum_dummy3.log & + UBSAN_OPTIONS="suppressions=../tests/src/ubsan_sup.txt halt_on_error=1" ./p2pool --host xmrnode.facspro.net --rpc-port 18089 --zmq-port 18084 --wallet 44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg --data-api data --local-api --loglevel 6 + grep 'Synchronization finished successfully' p2pool.log + + - name: Archive p2pool.log + uses: actions/upload-artifact@v3 + with: + name: p2pool_ubuntu_data_ubsan + path: | + build/*.log + build/data/ + sync-test-macos: timeout-minutes: 30 diff --git a/CMakeLists.txt b/CMakeLists.txt index 71b9f27..a293ca3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,7 @@ option(WITH_UPNP "Include UPnP support. If this is turned off, p2pool will not b option(DEV_TEST_SYNC "[Developer only] Sync test, stop p2pool after sync is complete" OFF) option(DEV_WITH_TSAN "[Developer only] Compile with thread sanitizer" OFF) option(DEV_WITH_MSAN "[Developer only] Compile with memory sanitizer" OFF) +option(DEV_WITH_UBSAN "[Developer only] Compile with undefined behavior sanitizer" OFF) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake") @@ -41,6 +42,10 @@ if (DEV_WITH_MSAN) add_definitions(-DDEV_WITH_MSAN) endif() +if (DEV_WITH_UBSAN) + add_definitions(-DDEV_WITH_UBSAN) +endif() + include(cmake/flags.cmake) set(HEADERS @@ -288,7 +293,7 @@ endif() add_executable(${CMAKE_PROJECT_NAME} ${HEADERS} ${SOURCES}) if (STATIC_BINARY OR STATIC_LIBS) - if (NOT (DEV_WITH_TSAN OR DEV_WITH_MSAN)) + if (NOT (DEV_WITH_TSAN OR DEV_WITH_MSAN OR DEV_WITH_UBSAN)) if (WIN32) add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_STRIP} "${CMAKE_PROJECT_NAME}.exe") else() diff --git a/cmake/flags.cmake b/cmake/flags.cmake index 4d7607d..44134db 100644 --- a/cmake/flags.cmake +++ b/cmake/flags.cmake @@ -12,9 +12,13 @@ if (CMAKE_CXX_COMPILER_ID MATCHES GNU) set(GENERAL_FLAGS "${GENERAL_FLAGS} -fno-omit-frame-pointer -fsanitize=thread") endif() + if (DEV_WITH_UBSAN) + set(GENERAL_FLAGS "${GENERAL_FLAGS} -fno-omit-frame-pointer -fsanitize=undefined") + endif() + set(WARNING_FLAGS "-Wall -Wextra -Wcast-align -Wcast-qual -Wlogical-op -Wstrict-overflow=2 -Wundef -Wformat=2 -Wpointer-arith -Werror") - if (DEV_WITH_TSAN) + if (DEV_WITH_TSAN OR DEV_WITH_UBSAN) set(OPTIMIZATION_FLAGS "-O2 -g") else() set(OPTIMIZATION_FLAGS "-Ofast -s") diff --git a/tests/src/ubsan_sup.txt b/tests/src/ubsan_sup.txt new file mode 100644 index 0000000..e3e6900 --- /dev/null +++ b/tests/src/ubsan_sup.txt @@ -0,0 +1 @@ +shift-base:crypto-ops.c