Skip to content

Add SDL hardening flags for MSVC #2406

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 1 commit into from
Dec 9, 2024
Merged

Add SDL hardening flags for MSVC #2406

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
33 changes: 23 additions & 10 deletions cmake/helpers.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,18 +114,28 @@ function(add_ur_target_compile_options name)
elseif(MSVC)
target_compile_options(${name} PRIVATE
$<$<CXX_COMPILER_ID:MSVC>:/MP> # clang-cl.exe does not support /MP
/W3
/MD$<$<CONFIG:Debug>:d>
/GS
/DWIN32_LEAN_AND_MEAN
/DNOMINMAX

/W3
/GS # Enable: Buffer security check
/Gy # Enable: Function-level linking

$<$<CONFIG:Release>:/sdl> # Enable: Additional SDL checks
$<$<CXX_COMPILER_ID:MSVC>:/Qspectre> # Enable: Mitigate Spectre variant 1 vulnerabilities

/wd4267 # Disable: 'var' : conversion from 'size_t' to 'type', possible loss of data
/wd6244 # Disable: local declaration of 'variable' hides previous declaration
/wd6246 # Disable: local declaration of 'variable' hides declaration of same name in outer scope
)

target_compile_definitions(${name} PRIVATE
WIN32_LEAN_AND_MEAN NOMINMAX # Cajole Windows.h to define fewer symbols
_CRT_SECURE_NO_WARNINGS # Slience warnings about getenv
)

if(UR_DEVELOPER_MODE)
# _CRT_SECURE_NO_WARNINGS used mainly because of getenv
# C4267: The compiler detected a conversion from size_t to a smaller type.
target_compile_options(${name} PRIVATE
/WX /GS /D_CRT_SECURE_NO_WARNINGS /wd4267
/WX # Enable: Treat all warnings as errors
)
endif()
endif()
Expand All @@ -149,9 +159,12 @@ function(add_ur_target_link_options name)
endif()
elseif(MSVC)
target_link_options(${name} PRIVATE
LINKER:/DYNAMICBASE
LINKER:/HIGHENTROPYVA
LINKER:/NXCOMPAT
LINKER:/DYNAMICBASE # Enable: Modify header to indicate ASLR should be use
LINKER:/HIGHENTROPYVA # Enable: High-entropy address space layout randomization (ASLR)
$<$<CONFIG:Release>:
LINKER:/NXCOMPAT # Enable: Data Execution Prevention
LINKER:/LTCG # Enable: Link-time code generation
>
)
endif()
endfunction()
Expand Down
1 change: 1 addition & 0 deletions test/conformance/exp_command_buffer/fixtures.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#ifndef UR_CONFORMANCE_COMMAND_BUFFER_FIXTURES_H_INCLUDED
#define UR_CONFORMANCE_COMMAND_BUFFER_FIXTURES_H_INCLUDED

#include <array>
#include <uur/fixtures.h>

namespace uur {
Expand Down