Skip to content

Add a handful of compiler options to harden code #8551

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

Merged
merged 2 commits into from
Dec 4, 2023
Merged

Add a handful of compiler options to harden code #8551

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd6ee2b
Add a handful of compiler options to harden code
grendello Dec 1, 2023
ecb58d6
Don't need that one
grendello Dec 1, 2023
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
23 changes: 22 additions & 1 deletion src/monodroid/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,16 +331,37 @@ set(LOCAL_COMMON_COMPILER_ARGS
-Werror=format-security
-Werror=return-type
-Wextra
-Wformat
-Wformat-security
-Wformat=2
-Wimplicit-fallthrough
-Wmisleading-indentation
-Wnull-dereference
-Wpointer-arith
-Wshadow
-Wsign-compare
-Wtrampolines
-Wuninitialized
-fstack-clash-protection
-fstrict-flex-arrays=3
)

# Add some options to increase security. They may mildly affect performance but they won't be big, because the features are
# assisted by the hardware.
if((CMAKE_ANDROID_ARCH_ABI STREQUAL "x86") OR (CMAKE_ANDROID_ARCH_ABI STREQUAL "x86_64"))
# -fcf-protection=full: Enable control flow protection to counter Return Oriented Programming (ROP) and Jump Oriented Programming (JOP) attacks on many x86 architectures
list(APPEND LOCAL_COMMON_COMPILER_ARGS
-fcf-protection=full
)
endif()

if(CMAKE_ANDROID_ARCH_ABI STREQUAL "arm64-v8a")
# -mbranch-protection=standard: Enable branch protection to counter Return Oriented Programming (ROP) and Jump Oriented Programming (JOP) attacks on AArch64
# In clang -mbranch-protection=standard is equivalent to -mbranch-protection=bti+pac-ret and invokes the AArch64 Branch Target Identification (BTI) and Pointer Authentication using key A (pac-ret)
list(APPEND LOCAL_COMMON_COMPILER_ARGS
-mbranch-protection=standard
)
endif()

if(COMPILER_DIAG_COLOR)
list(APPEND LOCAL_COMMON_COMPILER_ARGS
-fdiagnostics-color=always
Expand Down