Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test: Add control flow integrity sanitizer. #2399

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

test: Add control flow integrity sanitizer. #2399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions .circleci/cmake-cfisan
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
#!/bin/bash

set -eu

CACHEDIR="$HOME/cache"

. ".github/scripts/flags-$CC.sh"
add_flag -Werror
add_flag -fdiagnostics-color=always
add_flag -flto=thin # for cfi
add_flag -fvisibility=hidden # for cfi
add_flag -fno-omit-frame-pointer
add_flag -fsanitize=cfi
cmake -B_build -H. -GNinja \
-DCMAKE_C_FLAGS="$C_FLAGS" \
-DCMAKE_CXX_FLAGS="$CXX_FLAGS" \
-DCMAKE_EXE_LINKER_FLAGS="$LD_FLAGS" \
-DCMAKE_SHARED_LINKER_FLAGS="$LD_FLAGS" \
-DCMAKE_INSTALL_PREFIX:PATH="$PWD/_install" \
-DCMAKE_UNITY_BUILD=ON \
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
-DMIN_LOGGER_LEVEL=TRACE \
-DMUST_BUILD_TOXAV=ON \
-DNON_HERMETIC_TESTS=ON \
-DSTRICT_ABI=ON \
-DENABLE_SHARED=OFF \
-DTEST_TIMEOUT_SECONDS=120 \
-DUSE_IPV6=OFF \
-DAUTOTEST=ON

cd _build

ninja install -j"$(nproc)"

ctest -j50 --output-on-failure --rerun-failed --repeat until-pass:6
12 changes: 12 additions & 0 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ workflows:
- bazel-tsan
# Dynamic analysis with CMake
- asan
- cfisan
- tsan
- ubsan
# Static analysis
Expand Down Expand Up @@ -92,6 +93,17 @@ jobs:
- run: git submodule update --init --recursive
- run: CC=clang .circleci/cmake-tsan

cfisan:
working_directory: ~/work
docker:
- image: ubuntu

steps:
- run: *apt_install
- checkout
- run: git submodule update --init --recursive
- run: CC=clang .circleci/cmake-cfisan

ubsan:
working_directory: ~/work
docker:
Expand Down
7 changes: 5 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
#
################################################################################

cmake_minimum_required(VERSION 3.5)
cmake_policy(VERSION 3.5)
cmake_minimum_required(VERSION 3.9)
cmake_policy(VERSION 3.9)
project(toxcore)

list(APPEND CMAKE_MODULE_PATH ${toxcore_SOURCE_DIR}/cmake)
Expand Down Expand Up @@ -75,6 +75,9 @@ if(APPLE)
include(MacRpath)
endif()

include(CheckIPOSupported)
check_ipo_supported()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Calling this without any arguments makes IPO being unsupported a fatal error. I guess we can either set CMAKE_INTERPROCEDURAL_OPTIMIZATION based on if IPO is supported, or only perform this check if CMAKE_INTERPROCEDURAL_OPTIMIZATION is true.


enable_testing()

set(CMAKE_MACOSX_RPATH ON)
Expand Down
2 changes: 1 addition & 1 deletion other/docker/circleci/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
################################################
# cmake-asan
FROM ubuntu:20.04
FROM ubuntu:22.04

RUN apt-get update && \
DEBIAN_FRONTEND="noninteractive" apt-get install -y --no-install-recommends \
Expand Down
Loading