From 218caa410aa38c29984be31a5229b9fa717560ee Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:19:13 +0200 Subject: Merging upstream version 1.68.2+dfsg1. Signed-off-by: Daniel Baumann --- .../sanitizer-staticlib-link/Makefile | 20 ++++++++++++++++++++ .../sanitizer-staticlib-link/library.rs | 5 +++++ .../sanitizer-staticlib-link/program.c | 6 ++++++ .../sanitizer-staticlib-link/program.rs | 10 ++++++++++ 4 files changed, 41 insertions(+) create mode 100644 tests/run-make-fulldeps/sanitizer-staticlib-link/Makefile create mode 100644 tests/run-make-fulldeps/sanitizer-staticlib-link/library.rs create mode 100644 tests/run-make-fulldeps/sanitizer-staticlib-link/program.c create mode 100644 tests/run-make-fulldeps/sanitizer-staticlib-link/program.rs (limited to 'tests/run-make-fulldeps/sanitizer-staticlib-link') diff --git a/tests/run-make-fulldeps/sanitizer-staticlib-link/Makefile b/tests/run-make-fulldeps/sanitizer-staticlib-link/Makefile new file mode 100644 index 000000000..7b1a286ed --- /dev/null +++ b/tests/run-make-fulldeps/sanitizer-staticlib-link/Makefile @@ -0,0 +1,20 @@ +# needs-sanitizer-support +# needs-sanitizer-address + +include ../tools.mk + +# This test first builds a staticlib with AddressSanitizer and checks that +# linking it to an executable fails due to the missing sanitizer runtime. +# It then builds an executable linking to the staticlib and checks that +# the fault in the staticlib is detected correctly. + +# Note that checking for the link failure actually checks two things at once: +# 1) That the library has the sanitizer intrumentation +# 2) and that library does not have the sanitizer runtime + +all: + $(RUSTC) -g -Z sanitizer=address --crate-type staticlib --target $(TARGET) library.rs + ! $(CC) program.c $(call STATICLIB,library) $(call OUT_EXE,program) $(EXTRACFLAGS) $(EXTRACXXFLAGS) + $(RUSTC) -g -Z sanitizer=address --crate-type bin --target $(TARGET) -L . program.rs + LD_LIBRARY_PATH=$(TMPDIR) $(TMPDIR)/program 2>&1 | $(CGREP) stack-buffer-overflow + diff --git a/tests/run-make-fulldeps/sanitizer-staticlib-link/library.rs b/tests/run-make-fulldeps/sanitizer-staticlib-link/library.rs new file mode 100644 index 000000000..f2a52cb5c --- /dev/null +++ b/tests/run-make-fulldeps/sanitizer-staticlib-link/library.rs @@ -0,0 +1,5 @@ +#[no_mangle] +pub extern "C" fn overflow() { + let xs = [0, 1, 2, 3]; + let _y = unsafe { *xs.as_ptr().offset(4) }; +} diff --git a/tests/run-make-fulldeps/sanitizer-staticlib-link/program.c b/tests/run-make-fulldeps/sanitizer-staticlib-link/program.c new file mode 100644 index 000000000..735e2b147 --- /dev/null +++ b/tests/run-make-fulldeps/sanitizer-staticlib-link/program.c @@ -0,0 +1,6 @@ +void overflow(); + +int main() { + overflow(); + return 0; +} diff --git a/tests/run-make-fulldeps/sanitizer-staticlib-link/program.rs b/tests/run-make-fulldeps/sanitizer-staticlib-link/program.rs new file mode 100644 index 000000000..ec59bdb11 --- /dev/null +++ b/tests/run-make-fulldeps/sanitizer-staticlib-link/program.rs @@ -0,0 +1,10 @@ +#[link(name = "library")] +extern "C" { + fn overflow(); +} + +fn main() { + unsafe { + overflow(); + } +} -- cgit v1.2.3