mirror of
https://github.com/systemd/systemd.git
synced 2024-12-22 17:35:35 +03:00
mkosi: Simplify sanitizer setup
Let's get rid of 20-sanitizers.conf and just move it into mkosi.sanitizers instead.
This commit is contained in:
parent
27369124e8
commit
aed18d7e9a
@ -147,3 +147,6 @@ QemuSmp=2
|
|||||||
QemuSwtpm=yes
|
QemuSwtpm=yes
|
||||||
QemuVsock=yes
|
QemuVsock=yes
|
||||||
QemuKvm=yes
|
QemuKvm=yes
|
||||||
|
|
||||||
|
[Include]
|
||||||
|
Include=%D/mkosi.sanitizers
|
||||||
|
@ -1,25 +0,0 @@
|
|||||||
# SPDX-License-Identifier: LGPL-2.1-or-later
|
|
||||||
|
|
||||||
[Match]
|
|
||||||
Environment=SANITIZERS
|
|
||||||
Environment=!SANITIZERS=
|
|
||||||
|
|
||||||
[Build]
|
|
||||||
# Set verify_asan_link_order=0 to prevent ASAN warnings when building the image and make sure the real ASAN
|
|
||||||
# options are set when booting the image.
|
|
||||||
# Set intercept_tls_get_addr=0 to work around leak sanitizer segmentation fault in test-dlopen-so on CentOS
|
|
||||||
# Stream 9.
|
|
||||||
# TODO: Drop intercept_tls_get_addr=0 when we remove CentOS Stream 9 builds.
|
|
||||||
Environment=ASAN_OPTIONS=verify_asan_link_order=0:intercept_tls_get_addr=0
|
|
||||||
|
|
||||||
[Content]
|
|
||||||
KernelCommandLine=
|
|
||||||
ASAN_OPTIONS=strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1:disable_coredump=0:use_madv_dontdump=1
|
|
||||||
systemd.setenv=ASAN_OPTIONS=strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1:disable_coredump=0:use_madv_dontdump=1
|
|
||||||
UBSAN_OPTIONS=print_stacktrace=1:print_summary=1:halt_on_error=1
|
|
||||||
systemd.setenv=UBSAN_OPTIONS=print_stacktrace=1:print_summary=1:halt_on_error=1
|
|
||||||
LSAN_OPTIONS=suppressions=/usr/lib/systemd/leak-sanitizer-suppressions
|
|
||||||
systemd.setenv=LSAN_OPTIONS=suppressions=/usr/lib/systemd/leak-sanitizer-suppressions
|
|
||||||
|
|
||||||
[Include]
|
|
||||||
Include=%D/mkosi.sanitizers
|
|
@ -3,3 +3,20 @@
|
|||||||
[Match]
|
[Match]
|
||||||
Environment=SANITIZERS
|
Environment=SANITIZERS
|
||||||
Environment=!SANITIZERS=
|
Environment=!SANITIZERS=
|
||||||
|
|
||||||
|
[Build]
|
||||||
|
# Set verify_asan_link_order=0 to prevent ASAN warnings when building the image and make sure the real ASAN
|
||||||
|
# options are set when booting the image.
|
||||||
|
# Set intercept_tls_get_addr=0 to work around leak sanitizer segmentation fault in test-dlopen-so on CentOS
|
||||||
|
# Stream 9.
|
||||||
|
# TODO: Drop intercept_tls_get_addr=0 when we remove CentOS Stream 9 builds.
|
||||||
|
Environment=ASAN_OPTIONS=verify_asan_link_order=0:intercept_tls_get_addr=0
|
||||||
|
|
||||||
|
[Content]
|
||||||
|
KernelCommandLine=
|
||||||
|
ASAN_OPTIONS=strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1:disable_coredump=0:use_madv_dontdump=1
|
||||||
|
systemd.setenv=ASAN_OPTIONS=strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1:disable_coredump=0:use_madv_dontdump=1
|
||||||
|
UBSAN_OPTIONS=print_stacktrace=1:print_summary=1:halt_on_error=1
|
||||||
|
systemd.setenv=UBSAN_OPTIONS=print_stacktrace=1:print_summary=1:halt_on_error=1
|
||||||
|
LSAN_OPTIONS=suppressions=/usr/lib/systemd/leak-sanitizer-suppressions
|
||||||
|
systemd.setenv=LSAN_OPTIONS=suppressions=/usr/lib/systemd/leak-sanitizer-suppressions
|
||||||
|
Loading…
Reference in New Issue
Block a user