Module Name: src
Committed By: mgorny
Date: Tue Jan 29 19:59:10 UTC 2019
Modified Files:
src/tests/usr.bin/cc: Makefile t_ubsan_int_add_overflow.sh
t_ubsan_int_divzero.sh t_ubsan_int_neg_overflow.sh
t_ubsan_int_sub_overflow.sh t_ubsan_vla_out_of_bounds.sh
Added Files:
src/tests/usr.bin/cc: ubsan_common.subr
Log Message:
Move common UBSAN test case code into ubsan_common.subr
Reviewed by <kamil>
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/usr.bin/cc/Makefile
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/cc/t_ubsan_int_add_overflow.sh \
src/tests/usr.bin/cc/t_ubsan_int_divzero.sh \
src/tests/usr.bin/cc/t_ubsan_int_neg_overflow.sh \
src/tests/usr.bin/cc/t_ubsan_int_sub_overflow.sh
cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/cc/t_ubsan_vla_out_of_bounds.sh
cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/cc/ubsan_common.subr
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/cc/Makefile
diff -u src/tests/usr.bin/cc/Makefile:1.5 src/tests/usr.bin/cc/Makefile:1.6
--- src/tests/usr.bin/cc/Makefile:1.5 Tue Jan 29 19:56:37 2019
+++ src/tests/usr.bin/cc/Makefile Tue Jan 29 19:59:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/01/29 19:56:37 mgorny Exp $
+# $NetBSD: Makefile,v 1.6 2019/01/29 19:59:10 mgorny Exp $
.include <bsd.own.mk>
@@ -12,17 +12,23 @@ ASAN_TESTS+= t_asan_off_by_one
ASAN_TESTS+= t_asan_poison
ASAN_TESTS+= t_asan_uaf
+UBSAN_TESTS= #
+UBSAN_TESTS+= t_ubsan_int_add_overflow
+UBSAN_TESTS+= t_ubsan_int_neg_overflow
+UBSAN_TESTS+= t_ubsan_vla_out_of_bounds
+UBSAN_TESTS+= t_ubsan_int_sub_overflow
+UBSAN_TESTS+= t_ubsan_int_divzero
+
TESTS_SH= #
TESTS_SH+= $(ASAN_TESTS)
-TESTS_SH+= t_ubsan_int_add_overflow
-TESTS_SH+= t_ubsan_int_sub_overflow
-TESTS_SH+= t_ubsan_int_neg_overflow
-TESTS_SH+= t_ubsan_int_divzero
-TESTS_SH+= t_ubsan_vla_out_of_bounds
+TESTS_SH+= $(UBSAN_TESTS)
TESTS_SH+= t_hello
.for test in ${ASAN_TESTS}
TESTS_SH_SRC_${test}= asan_common.subr ${test}.sh
.endfor
+.for test in ${UBSAN_TESTS}
+TESTS_SH_SRC_${test}= ubsan_common.subr ${test}.sh
+.endfor
.include <bsd.test.mk>
Index: src/tests/usr.bin/cc/t_ubsan_int_add_overflow.sh
diff -u src/tests/usr.bin/cc/t_ubsan_int_add_overflow.sh:1.3 src/tests/usr.bin/cc/t_ubsan_int_add_overflow.sh:1.4
--- src/tests/usr.bin/cc/t_ubsan_int_add_overflow.sh:1.3 Mon Jul 16 07:25:58 2018
+++ src/tests/usr.bin/cc/t_ubsan_int_add_overflow.sh Tue Jan 29 19:59:10 2019
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 The NetBSD Foundation, Inc.
+# Copyright (c) 2018, 2019 The NetBSD Foundation, Inc.
# All rights reserved.
#
# This code is derived from software contributed to The NetBSD Foundation
@@ -26,172 +26,23 @@
# POSSIBILITY OF SUCH DAMAGE.
#
-test_target()
-{
- SUPPORT='n'
- if ! echo __GNUC__ | cc -E - | grep -q __GNUC__; then
- SUPPORT='y'
- fi
-
- if ! echo __clang__ | cc -E - | grep -q __clang__; then
- SUPPORT='y'
- fi
-}
-
-atf_test_case int_add_overflow
-int_add_overflow_head() {
- atf_set "descr" "Test Undefined Behavior for int addition overflows"
- atf_set "require.progs" "cc"
-}
-
-atf_test_case int_add_overflow_profile
-int_add_overflow_profile_head() {
- atf_set "descr" "Test Undefined Behavior for int addition overflows with profiling option"
- atf_set "require.progs" "cc"
-}
-atf_test_case int_add_overflow_pic
-int_add_overflow_pic_head() {
- atf_set "descr" "Test Undefined Behavior for int addition overflows with position independent code (PIC) flag"
- atf_set "require.progs" "cc"
-}
-atf_test_case int_add_overflow_pie
-int_add_overflow_pie_head() {
- atf_set "descr" "Test Undefined Behavior for int addition overflows with position independent execution (PIE) flag"
- atf_set "require.progs" "cc"
-}
-atf_test_case int_add_overflow32
-int_add_overflow32_head() {
- atf_set "descr" "Test Undefined Behavior for int addition overflows in NetBSD_32 emulation"
- atf_set "require.progs" "cc file diff cat"
-}
-
-
-int_add_overflow_body(){
- cat > test.c << EOF
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-int main(int argc, char **argv) {volatile int l = INT_MAX; l+=argc; return l;}
-EOF
-
- cc -fsanitize=undefined -o test test.c
- atf_check -e match:"signed integer overflow" ./test
-}
-
-int_add_overflow_profile_body(){
- cat > test.c << EOF
+UBSAN_CODE='
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
-int main(int argc, char **argv) {volatile int l = INT_MAX; l+=argc; return l;}
-EOF
-
- cc -fsanitize=undefined -o test -pg test.c
- atf_check -e match:"signed integer overflow" ./test
-}
-
-int_add_overflow_pic_body(){
- cat > test.c << EOF
-#include <stdio.h>
-#include <stdlib.h>
int help(int);
-int main(int argc, char **argv) {volatile int k = help(argc); return k;}
-EOF
-
- cat > pic.c << EOF
-#include <stdlib.h>
-#include <stdio.h>
-#include <limits.h>
+#ifndef PIC_MAIN
int help(int count) {volatile int l = INT_MAX; l+= count; return l;}
-EOF
-
- cc -fsanitize=undefined -fPIC -shared -o libtest.so pic.c
- cc -o test test.c -fsanitize=undefined -L. -ltest
-
- export LD_LIBRARY_PATH=.
- atf_check -e match:"signed integer overflow" ./test
-}
-
-int_add_overflow_pie_body(){
-
- #check whether -pie flag is supported on this architecture
- if ! cc -pie -dM -E - < /dev/null 2>/dev/null >/dev/null; then
- atf_set_skip "cc -pie not supported on this architecture"
- fi
- cat > test.c << EOF
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-int main(int argc, char **argv) {volatile int l = INT_MAX; l+= argc; return l;}
-EOF
-
- cc -fsanitize=undefined -o test -fpie -pie test.c
- atf_check -e match:"signed integer overflow" ./test
-}
-
-
-int_add_overflow32_body(){
-
- # check what this architecture is, after all
- if ! cc -dM -E - < /dev/null | grep -F -q _LP64; then
- atf_skip "This is not a 64 bit architecture"
- fi
- if ! cc -m32 -dM -E - < /dev/null 2>/dev/null > ./def32; then
- atf_skip "cc -m32 Not supported on this architecture"
- else
- if grep -F -q _LP64 ./def32; then
- atf_fail "cc -m32 Does not generate NetBSD32 binaries"
- fi
- fi
-
- cat > test.c << EOF
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-int main(int argc, char **argv) {volatile int l = INT_MAX; l+= argc; return l;}
-EOF
-
- cc -fsanitize=undefined -o md32 -m32 test.c
- cc -fsanitize=undefined -o md64 test.c
- file -b ./md32 > ./ftype32
- file -b ./md64 > ./ftype64
- if diff ./ftype32 ./ftype64 >/dev/null; then
- atf_fail "Generated 32bit binaries do not differ from 64bit ones"
- fi
- echo "32bit binaries on this platform are:"
- cat ./ftype32
- echo "64bit binaries are on the other hand:"
- cat ./ftype64
- atf_check -e match:"signed integer overflow" ./md32
-
- # Another test with profile 32bit binaries, just to make sure everything has been thoroughly done
- cat > test.c << EOF
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-int main(int argc, char **argv) {volatile int l = INT_MAX; l+= argc; return l;}
-EOF
-
- cc -fsanitize=undefined -pg -m32 -o test test.c
- atf_check -e match:"signed integer overflow" ./test
-}
+#endif
+#ifndef PIC_FOO
+int main(int argc, char **argv) {volatile int l = INT_MAX; l+=argc; return l;}
+#endif
+'
-atf_test_case target_not_supported
-target_not_supported_head()
-{
- atf_set "descr" "Test forced skip"
-}
+ubsan_test_case int_add_overflow "int addition overflows" \
+ "signed integer overflow"
atf_init_test_cases()
{
- test_target
- test $SUPPORT = 'n' && {
- atf_add_test_case target_not_supported
- return 0
- }
- atf_add_test_case int_add_overflow
-# atf_add_test_case int_add_overflow_profile
- atf_add_test_case int_add_overflow_pie
- atf_add_test_case int_add_overflow_pic
-# atf_add_test_case int_add_overflow32
+ ubsan_add_test_cases int_add_overflow
}
Index: src/tests/usr.bin/cc/t_ubsan_int_divzero.sh
diff -u src/tests/usr.bin/cc/t_ubsan_int_divzero.sh:1.3 src/tests/usr.bin/cc/t_ubsan_int_divzero.sh:1.4
--- src/tests/usr.bin/cc/t_ubsan_int_divzero.sh:1.3 Mon Jul 16 07:25:58 2018
+++ src/tests/usr.bin/cc/t_ubsan_int_divzero.sh Tue Jan 29 19:59:10 2019
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 The NetBSD Foundation, Inc.
+# Copyright (c) 2018, 2019 The NetBSD Foundation, Inc.
# All rights reserved.
#
# This code is derived from software contributed to The NetBSD Foundation
@@ -26,165 +26,21 @@
# POSSIBILITY OF SUCH DAMAGE.
#
-test_target()
-{
- SUPPORT='n'
- if ! echo __GNUC__ | cc -E - | grep -q __GNUC__; then
- SUPPORT='y'
- fi
-
- if ! echo __clang__ | cc -E - | grep -q __clang__; then
- SUPPORT='y'
- fi
-}
-
-atf_test_case int_divzero
-int_divzero_head() {
- atf_set "descr" "Test Undefined Behavior for int division with zero"
- atf_set "require.progs" "cc"
-}
-
-atf_test_case int_divzero_profile
-int_divzero_profile_head() {
- atf_set "descr" "Test Undefined Behavior for int division with zero with profiling option"
- atf_set "require.progs" "cc"
-}
-atf_test_case int_divzero_pic
-int_divzero_pic_head() {
- atf_set "descr" "Test Undefined Behavior for int division with zero with position independent code (PIC) flag"
- atf_set "require.progs" "cc"
-}
-atf_test_case int_divzero_pie
-int_divzero_pie_head() {
- atf_set "descr" "Test Undefined Behavior for int division with zero with position independent execution (PIE) flag"
- atf_set "require.progs" "cc"
-}
-atf_test_case int_divzero32
-int_divzero32_head() {
- atf_set "descr" "Test Undefined Behavior for int division with zero in NetBSD_32 emulation"
- atf_set "require.progs" "cc file diff cat"
-}
-
-
-int_divzero_body(){
- cat > test.c << EOF
-#include <stdio.h>
-#include <stdlib.h>
-int main(int argc, char **argv) {volatile int l = argc; volatile int k = 0; l/= k; return l;}
-EOF
-
- cc -fsanitize=integer-divide-by-zero -o test test.c
- atf_check -s signal:8 -e match:"division by zero" ./test
-}
-
-int_divzero_profile_body(){
- cat > test.c << EOF
-#include <stdio.h>
-#include <stdlib.h>
-int main(int argc, char **argv) {volatile int l = argc; volatile int k = 0; l/= k; return l;}
-EOF
-
- cc -fsanitize=integer-divide-by-zero -o test -pg test.c
- atf_check -s signal:8 -e match:"division by zero" ./test
-}
-
-int_divzero_pic_body(){
- cat > test.c << EOF
+UBSAN_CODE='
#include <stdio.h>
#include <stdlib.h>
int help(int);
-int main(int argc, char **argv) {return help(argc);}
-EOF
-
- cat > pic.c << EOF
-#include <stdlib.h>
-#include <stdio.h>
+#ifndef PIC_MAIN
int help(int count) {volatile int l = count; volatile int k = 0; return l/k;}
-EOF
-
- cc -fsanitize=integer-divide-by-zero -fPIC -shared -o libtest.so pic.c
- cc -o test test.c -fsanitize=integer-divide-by-zero -L. -ltest
-
- export LD_LIBRARY_PATH=.
- atf_check -s signal:8 -e match:"division by zero" ./test
-}
-int_divzero_pie_body(){
-
- #check whether -pie flag is supported on this architecture
- if ! cc -pie -dM -E - < /dev/null 2>/dev/null >/dev/null; then
- atf_set_skip "cc -pie not supported on this architecture"
- fi
- cat > test.c << EOF
-#include <stdio.h>
-#include <stdlib.h>
-int main(int argc, char **argv) {volatile int l = argc; int k = 0; l/= k; return l;}
-EOF
-
- cc -fsanitize=integer-divide-by-zero -o test -fpie -pie test.c
- atf_check -s signal:8 -e match:"division by zero" ./test
-}
-
-
-int_divzero32_body(){
-
- # check what this architecture is, after all
- if ! cc -dM -E - < /dev/null | grep -F -q _LP64; then
- atf_skip "This is not a 64 bit architecture"
- fi
- if ! cc -m32 -dM -E - < /dev/null 2>/dev/null > ./def32; then
- atf_skip "cc -m32 Not supported on this architecture"
- else
- if grep -F -q _LP64 ./def32; then
- atf_fail "cc -m32 Does not generate NetBSD32 binaries"
- fi
- fi
-
- cat > test.c << EOF
-#include <stdio.h>
-#include <stdlib.h>
-int main(int argc, char **argv) {int l = argc; int k = 0; l/= k; return l;}
-EOF
-
- cc -fsanitize=integer-divide-by-zero -o md32 -m32 test.c
- cc -fsanitize=integer-divide-by-zero -o md64 test.c
- file -b ./md32 > ./ftype32
- file -b ./md64 > ./ftype64
- if diff ./ftype32 ./ftype64 >/dev/null; then
- atf_fail "Generated 32bit binaries do not differ from 64bit ones"
- fi
- echo "32bit binaries on this platform are:"
- cat ./ftype32
- echo "64bit binaries are on the other hand:"
- cat ./ftype64
- atf_check -s signal:8 -e match:"division by zero" ./md32
-
- # Another test with profile 32bit binaries, just to make sure everything has been thoroughly done
- cat > test.c << EOF
-#include <stdio.h>
-#include <stdlib.h>
-int main(int argc, char **argv) {int l = argc; int k = 0; l /= k; return l;}
-EOF
-
- cc -fsanitize=integer-divide-by-zero -pg -m32 -o test test.c
- atf_check -s signal:8 -e match:"division by zero" ./test
-}
+#endif
+#ifndef PIC_FOO
+int main(int argc, char **argv) {return help(argc);}
+#endif
+'
-atf_test_case target_not_supported
-target_not_supported_head()
-{
- atf_set "descr" "Test forced skip"
-}
+ubsan_test_case int_divzero "int division with zero" "division by zero"
atf_init_test_cases()
{
- test_target
- test $SUPPORT = 'n' && {
- atf_add_test_case target_not_supported
- return 0
- }
- atf_add_test_case int_divzero
-# atf_add_test_case int_divzero_profile
- atf_add_test_case int_divzero_pie
- atf_add_test_case int_divzero_pic
-# atf_add_test_case int_divzero32
+ ubsan_add_test_cases int_divzero
}
Index: src/tests/usr.bin/cc/t_ubsan_int_neg_overflow.sh
diff -u src/tests/usr.bin/cc/t_ubsan_int_neg_overflow.sh:1.3 src/tests/usr.bin/cc/t_ubsan_int_neg_overflow.sh:1.4
--- src/tests/usr.bin/cc/t_ubsan_int_neg_overflow.sh:1.3 Mon Jul 16 07:25:58 2018
+++ src/tests/usr.bin/cc/t_ubsan_int_neg_overflow.sh Tue Jan 29 19:59:10 2019
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 The NetBSD Foundation, Inc.
+# Copyright (c) 2018, 2019 The NetBSD Foundation, Inc.
# All rights reserved.
#
# This code is derived from software contributed to The NetBSD Foundation
@@ -26,172 +26,22 @@
# POSSIBILITY OF SUCH DAMAGE.
#
-test_target()
-{
- SUPPORT='n'
- if ! echo __GNUC__ | cc -E - | grep -q __GNUC__; then
- SUPPORT='y'
- fi
-
- if ! echo __clang__ | cc -E - | grep -q __clang__; then
- SUPPORT='y'
- fi
-}
-
-atf_test_case int_neg_overflow
-int_neg_overflow_head() {
- atf_set "descr" "Test Undefined Behavior for int negation overflows"
- atf_set "require.progs" "cc"
-}
-
-atf_test_case int_neg_overflow_profile
-int_neg_overflow_profile_head() {
- atf_set "descr" "Test Undefined Behavior for int negation overflows with profiling option"
- atf_set "require.progs" "cc"
-}
-atf_test_case int_neg_overflow_pic
-int_neg_overflow_pic_head() {
- atf_set "descr" "Test Undefined Behavior for int negation overflows with position independent code (PIC) flag"
- atf_set "require.progs" "cc"
-}
-atf_test_case int_neg_overflow_pie
-int_neg_overflow_pie_head() {
- atf_set "descr" "Test Undefined Behavior for int negation overflows with position independent execution (PIE) flag"
- atf_set "require.progs" "cc"
-}
-atf_test_case int_neg_overflow32
-int_neg_overflow32_head() {
- atf_set "descr" "Test Undefined Behavior for int negation overflows in NetBSD_32 emulation"
- atf_set "require.progs" "cc file diff cat"
-}
-
-
-int_neg_overflow_body(){
- cat > test.c << EOF
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-int main(int argc, char **argv) {volatile int l = INT_MIN; l = -l; return l;}
-EOF
-
- cc -fsanitize=undefined -o test test.c
- atf_check -e match:"negation of" ./test
-}
-
-int_neg_overflow_profile_body(){
- cat > test.c << EOF
+UBSAN_CODE='
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
-int main(int argc, char **argv) {volatile int l = INT_MIN; l = -l; return l;}
-EOF
-
- cc -fsanitize=undefined -o test -pg test.c
- atf_check -e match:"negation of" ./test
-}
-
-int_neg_overflow_pic_body(){
- cat > test.c << EOF
-#include <stdio.h>
-#include <stdlib.h>
int help(int);
-int main(int argc, char **argv) {return help(argc);}
-EOF
-
- cat > pic.c << EOF
-#include <stdlib.h>
-#include <stdio.h>
-#include <limits.h>
+#ifndef PIC_MAIN
int help(int count) {volatile int l = INT_MIN; l = -l; return l;}
-EOF
-
- cc -fsanitize=undefined -fPIC -shared -o libtest.so pic.c
- cc -o test test.c -fsanitize=undefined -L. -ltest
-
- export LD_LIBRARY_PATH=.
- atf_check -e match:"negation of" ./test
-}
-
-int_neg_overflow_pie_body(){
-
- #check whether -pie flag is supported on this architecture
- if ! cc -pie -dM -E - < /dev/null 2>/dev/null >/dev/null; then
- atf_set_skip "cc -pie not supported on this architecture"
- fi
- cat > test.c << EOF
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-int main(int argc, char **argv) {volatile int l = INT_MIN; l = -l; return l;}
-EOF
-
- cc -fsanitize=undefined -o test -fpie -pie test.c
- atf_check -e match:"negation of" ./test
-}
-
-
-int_neg_overflow32_body(){
-
- # check what this architecture is, after all
- if ! cc -dM -E - < /dev/null | grep -F -q _LP64; then
- atf_skip "This is not a 64 bit architecture"
- fi
- if ! cc -m32 -dM -E - < /dev/null 2>/dev/null > ./def32; then
- atf_skip "cc -m32 Not supported on this architecture"
- else
- if grep -F -q _LP64 ./def32; then
- atf_fail "cc -m32 Does not generate NetBSD32 binaries"
- fi
- fi
-
- cat > test.c << EOF
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-int main(int argc, char **argv) {volatile int l = INT_MIN; l = -l; return l;}
-EOF
-
- cc -fsanitize=undefined -o md32 -m32 test.c
- cc -fsanitize=undefined -o md64 test.c
- file -b ./md32 > ./ftype32
- file -b ./md64 > ./ftype64
- if diff ./ftype32 ./ftype64 >/dev/null; then
- atf_fail "Generated 32bit binaries do not differ from 64bit ones"
- fi
- echo "32bit binaries on this platform are:"
- cat ./ftype32
- echo "64bit binaries are on the other hand:"
- cat ./ftype64
- atf_check -e match:"negation of" ./md32
-
- # Another test with profile 32bit binaries, just to make sure everything has been thoroughly done
- cat > test.c << EOF
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-int main(int argc, char **argv) {volatile int l = INT_MIN; l = -l; return l;}
-EOF
-
- cc -fsanitize=undefined -pg -m32 -o test test.c
- atf_check -e match:"negation of" ./test
-}
+#endif
+#ifndef PIC_FOO
+int main(int argc, char **argv) {return help(argc);}
+#endif
+'
-atf_test_case target_not_supported
-target_not_supported_head()
-{
- atf_set "descr" "Test forced skip"
-}
+ubsan_test_case int_neg_overflow "int negation overflows" "negation of"
atf_init_test_cases()
{
- test_target
- test $SUPPORT = 'n' && {
- atf_add_test_case target_not_supported
- return 0
- }
- atf_add_test_case int_neg_overflow
-# atf_add_test_case int_neg_overflow_profile
- atf_add_test_case int_neg_overflow_pie
- atf_add_test_case int_neg_overflow_pic
-# atf_add_test_case int_neg_overflow32
+ ubsan_add_test_cases int_neg_overflow
}
Index: src/tests/usr.bin/cc/t_ubsan_int_sub_overflow.sh
diff -u src/tests/usr.bin/cc/t_ubsan_int_sub_overflow.sh:1.3 src/tests/usr.bin/cc/t_ubsan_int_sub_overflow.sh:1.4
--- src/tests/usr.bin/cc/t_ubsan_int_sub_overflow.sh:1.3 Mon Jul 16 07:25:58 2018
+++ src/tests/usr.bin/cc/t_ubsan_int_sub_overflow.sh Tue Jan 29 19:59:10 2019
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 The NetBSD Foundation, Inc.
+# Copyright (c) 2018, 2019 The NetBSD Foundation, Inc.
# All rights reserved.
#
# This code is derived from software contributed to The NetBSD Foundation
@@ -26,172 +26,23 @@
# POSSIBILITY OF SUCH DAMAGE.
#
-test_target()
-{
- SUPPORT='n'
- if ! echo __GNUC__ | cc -E - | grep -q __GNUC__; then
- SUPPORT='y'
- fi
-
- if ! echo __clang__ | cc -E - | grep -q __clang__; then
- SUPPORT='y'
- fi
-}
-
-atf_test_case int_sub_overflow
-int_sub_overflow_head() {
- atf_set "descr" "Test Undefined Behavior for int subtraction overflows"
- atf_set "require.progs" "cc"
-}
-
-atf_test_case int_sub_overflow_profile
-int_sub_overflow_profile_head() {
- atf_set "descr" "Test Undefined Behavior for int subtraction overflows with profiling option"
- atf_set "require.progs" "cc"
-}
-atf_test_case int_sub_overflow_pic
-int_sub_overflow_pic_head() {
- atf_set "descr" "Test Undefined Behavior for int subtraction overflows with position independent code (PIC) flag"
- atf_set "require.progs" "cc"
-}
-atf_test_case int_sub_overflow_pie
-int_sub_overflow_pie_head() {
- atf_set "descr" "Test Undefined Behavior for int subtraction overflows with position independent execution (PIE) flag"
- atf_set "require.progs" "cc"
-}
-atf_test_case int_sub_overflow32
-int_sub_overflow32_head() {
- atf_set "descr" "Test Undefined Behavior for int subtraction overflows in NetBSD_32 emulation"
- atf_set "require.progs" "cc file diff cat"
-}
-
-
-int_sub_overflow_body(){
- cat > test.c << EOF
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-int main(int argc, char **argv) {volatile int l = INT_MIN; l-=argc; return l;}
-EOF
-
- cc -fsanitize=undefined -o test test.c
- atf_check -s ignore -e match:"signed integer overflow" ./test
-}
-
-int_sub_overflow_profile_body(){
- cat > test.c << EOF
+UBSAN_CODE='
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
-int main(int argc, char **argv) {volatile int l = INT_MIN; l-=argc; return l;}
-EOF
-
- cc -fsanitize=undefined -o test -pg test.c
- atf_check -s ignore -e match:"signed integer overflow" ./test
-}
-
-int_sub_overflow_pic_body(){
- cat > test.c << EOF
-#include <stdio.h>
-#include <stdlib.h>
int help(int);
-int main(int argc, char **argv) {volatile int k = help(argc); return k;}
-EOF
-
- cat > pic.c << EOF
-#include <stdlib.h>
-#include <stdio.h>
-#include <limits.h>
+#ifndef PIC_MAIN
int help(int count) {volatile int l = INT_MIN; l-= count; return l;}
-EOF
-
- cc -fsanitize=undefined -fPIC -shared -o libtest.so pic.c
- cc -o test test.c -fsanitize=undefined -L. -ltest
-
- export LD_LIBRARY_PATH=.
- atf_check -s ignore -e match:"signed integer overflow" ./test
-}
-
-int_sub_overflow_pie_body(){
-
- #check whether -pie flag is supported on this architecture
- if ! cc -pie -dM -E - < /dev/null 2>/dev/null >/dev/null; then
- atf_set_skip "cc -pie not supported on this architecture"
- fi
- cat > test.c << EOF
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-int main(int argc, char **argv) {volatile int l = INT_MIN; l-= argc; return l;}
-EOF
-
- cc -fsanitize=undefined -o test -fpie -pie test.c
- atf_check -s ignore -e match:"signed integer overflow" ./test
-}
-
-
-int_sub_overflow32_body(){
-
- # check what this architecture is, after all
- if ! cc -dM -E - < /dev/null | grep -F -q _LP64; then
- atf_skip "This is not a 64 bit architecture"
- fi
- if ! cc -m32 -dM -E - < /dev/null 2>/dev/null > ./def32; then
- atf_skip "cc -m32 Not supported on this architecture"
- else
- if grep -F -q _LP64 ./def32; then
- atf_fail "cc -m32 Does not generate NetBSD32 binaries"
- fi
- fi
-
- cat > test.c << EOF
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-int main(int argc, char **argv) {volatile int l = INT_MIN; l-= argc; return l;}
-EOF
-
- cc -fsanitize=undefined -o md32 -m32 test.c
- cc -fsanitize=undefined -o md64 test.c
- file -b ./md32 > ./ftype32
- file -b ./md64 > ./ftype64
- if diff ./ftype32 ./ftype64 >/dev/null; then
- atf_fail "Generated 32bit binaries do not differ from 64bit ones"
- fi
- echo "32bit binaries on this platform are:"
- cat ./ftype32
- echo "64bit binaries are on the other hand:"
- cat ./ftype64
- atf_check -s ignore -e match:"signed integer overflow" ./md32
-
- # Another test with profile 32bit binaries, just to make sure everything has been thoroughly done
- cat > test.c << EOF
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-int main(int argc, char **argv) {volatile int l = INT_MIN; l-= argc; return l;}
-EOF
-
- cc -fsanitize=undefined -pg -m32 -o test test.c
- atf_check -s ignore -e match:"signed integer overflow" ./test
-}
+#endif
+#ifndef PIC_FOO
+int main(int argc, char **argv) {volatile int k = help(argc); return k;}
+#endif
+'
-atf_test_case target_not_supported
-target_not_supported_head()
-{
- atf_set "descr" "Test forced skip"
-}
+ubsan_test_case int_sub_overflow "int subtraction overflows" \
+ "signed integer overflow"
atf_init_test_cases()
{
- test_target
- test $SUPPORT = 'n' && {
- atf_add_test_case target_not_supported
- return 0
- }
- atf_add_test_case int_sub_overflow
-# atf_add_test_case int_sub_overflow_profile
- atf_add_test_case int_sub_overflow_pie
- atf_add_test_case int_sub_overflow_pic
-# atf_add_test_case int_sub_overflow32
+ ubsan_add_test_cases int_sub_overflow
}
Index: src/tests/usr.bin/cc/t_ubsan_vla_out_of_bounds.sh
diff -u src/tests/usr.bin/cc/t_ubsan_vla_out_of_bounds.sh:1.4 src/tests/usr.bin/cc/t_ubsan_vla_out_of_bounds.sh:1.5
--- src/tests/usr.bin/cc/t_ubsan_vla_out_of_bounds.sh:1.4 Mon Jul 16 07:25:58 2018
+++ src/tests/usr.bin/cc/t_ubsan_vla_out_of_bounds.sh Tue Jan 29 19:59:10 2019
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 The NetBSD Foundation, Inc.
+# Copyright (c) 2018, 2019 The NetBSD Foundation, Inc.
# All rights reserved.
#
# This code is derived from software contributed to The NetBSD Foundation
@@ -26,169 +26,22 @@
# POSSIBILITY OF SUCH DAMAGE.
#
-test_target()
-{
- SUPPORT='n'
- if ! echo __GNUC__ | cc -E - | grep -q __GNUC__; then
- SUPPORT='y'
- fi
-
- if ! echo __clang__ | cc -E - | grep -q __clang__; then
- SUPPORT='y'
- fi
-}
-
-atf_test_case vla_out_of_bounds
-vla_out_of_bounds_head() {
- atf_set "descr" "Test Undefined Behavior for vla (Variable Length Array) out of bounds"
- atf_set "require.progs" "cc"
-}
-
-atf_test_case vla_out_of_bounds_profile
-vla_out_of_bounds_profile_head() {
- atf_set "descr" "Test Undefined Behavior for vla (Variable Length Array) out of bounds with profiling option"
- atf_set "require.progs" "cc"
-}
-atf_test_case vla_out_of_bounds_pic
-vla_out_of_bounds_pic_head() {
- atf_set "descr" "Test Undefined Behavior for vla (Variable Length Array) out of bounds with position independent code (PIC) flag"
- atf_set "require.progs" "cc"
-}
-atf_test_case vla_out_of_bounds_pie
-vla_out_of_bounds_pie_head() {
- atf_set "descr" "Test Undefined Behavior for vla (Variable Length Array) out of bounds with position independent execution (PIE) flag"
- atf_set "require.progs" "cc"
-}
-atf_test_case vla_out_of_bounds32
-vla_out_of_bounds32_head() {
- atf_set "descr" "Test Undefined Behavior for vla (Variable Length Array) out of bounds in NetBSD_32 emulation"
- atf_set "require.progs" "cc file diff cat"
-}
-
-
-vla_out_of_bounds_body(){
- cat > test.c << EOF
-#include <stdio.h>
-#include <stdlib.h>
-int main(int argc, char **argv) {volatile int val1 = argc, val2 = argc+1; volatile int arr[val1]; arr[val2] = argc; exit(0);}
-EOF
-
- cc -fsanitize=undefined -o test test.c
- atf_check -e match:"out of bounds" ./test
-}
-
-vla_out_of_bounds_profile_body(){
- cat > test.c << EOF
-#include <stdio.h>
-#include <stdlib.h>
-int main(int argc, char **argv) {volatile int val1 = argc, val2 = argc+1; volatile int arr[val1]; arr[val2] = argc; exit(0);}
-EOF
-
- cc -fsanitize=undefined -o test -pg test.c
- atf_check -e match:"out of bounds" ./test
-}
-
-vla_out_of_bounds_pic_body(){
- cat > test.c << EOF
+UBSAN_CODE='
#include <stdio.h>
#include <stdlib.h>
void help(int);
-int main(int argc, char **argv) {help(argc); exit(0);}
-EOF
-
- cat > pic.c << EOF
-#include <stdlib.h>
-#include <stdio.h>
-#include <limits.h>
+#ifndef PIC_MAIN
void help(int count) {volatile int val1 = count, val2 = count+1; volatile int arr[val1]; arr[val2] = count; }
-EOF
-
- cc -fsanitize=undefined -fPIC -shared -o libtest.so pic.c
- cc -o test test.c -fsanitize=undefined -L. -ltest
-
- export LD_LIBRARY_PATH=.
- atf_check -e match:"out of bounds" ./test
-}
-
-vla_out_of_bounds_pie_body(){
-
- #check whether -pie flag is supported on this architecture
- if ! cc -pie -dM -E - < /dev/null 2>/dev/null >/dev/null; then
- atf_set_skip "cc -pie not supported on this architecture"
- fi
- cat > test.c << EOF
-#include <stdio.h>
-#include <stdlib.h>
-
-int main(int argc, char **argv) {volatile int val1 = argc, val2 = argc+1; volatile int arr[val1]; arr[val2] = argc; exit(0);}
-EOF
-
- cc -fsanitize=undefined -o test -fpie -pie test.c
- atf_check -e match:"out of bounds" ./test
-}
-
-
-vla_out_of_bounds32_body(){
-
- # check what this architecture is, after all
- if ! cc -dM -E - < /dev/null | grep -F -q _LP64; then
- atf_skip "This is not a 64 bit architecture"
- fi
- if ! cc -m32 -dM -E - < /dev/null 2>/dev/null > ./def32; then
- atf_skip "cc -m32 Not supported on this architecture"
- else
- if grep -F -q _LP64 ./def32; then
- atf_fail "cc -m32 Does not generate NetBSD32 binaries"
- fi
- fi
-
- cat > test.c << EOF
-#include <stdio.h>
-#include <stdlib.h>
-int main(int argc, char **argv) {volatile int val1 = argc, val2 = argc+1; volatile int arr[val1]; arr[val2] = argc; exit(0);}
-EOF
-
- cc -fsanitize=undefined -o md32 -m32 test.c
- cc -fsanitize=undefined -o md64 test.c
- file -b ./md32 > ./ftype32
- file -b ./md64 > ./ftype64
- if diff ./ftype32 ./ftype64 >/dev/null; then
- atf_fail "Generated 32bit binaries do not differ from 64bit ones"
- fi
- echo "32bit binaries on this platform are:"
- cat ./ftype32
- echo "64bit binaries are on the other hand:"
- cat ./ftype64
- atf_check -e match:"out of bounds" ./md32
-
- # Another test with profile 32bit binaries, just to make sure everything has been thoroughly done
- cat > test.c << EOF
-#include <stdio.h>
-#include <stdlib.h>
-
-int main(int argc, char **argv) { volatile int val1 = argc, val2 = argc+1; volatile int arr[val1]; arr[val2] = argc; exit(0);}
-EOF
-
- cc -fsanitize=undefined -pg -m32 -o test test.c
- atf_check -e match:"out of bounds" ./test
-}
+#endif
+#ifndef PIC_FOO
+int main(int argc, char **argv) {help(argc); exit(0);}
+#endif
+'
-atf_test_case target_not_supported
-target_not_supported_head()
-{
- atf_set "descr" "Test forced skip"
-}
+ubsan_test_case vla_out_of_bounds \
+ "vla (Variable Length Array) out of bounds" "out of bounds"
atf_init_test_cases()
{
- test_target
- test $SUPPORT = 'n' && {
- atf_add_test_case target_not_supported
- return 0
- }
- atf_add_test_case vla_out_of_bounds
-# atf_add_test_case vla_out_of_bounds_profile
- atf_add_test_case vla_out_of_bounds_pie
- atf_add_test_case vla_out_of_bounds_pic
-# atf_add_test_case vla_out_of_bounds32
+ ubsan_add_test_cases vla_out_of_bounds
}
Added files:
Index: src/tests/usr.bin/cc/ubsan_common.subr
diff -u /dev/null src/tests/usr.bin/cc/ubsan_common.subr:1.1
--- /dev/null Tue Jan 29 19:59:10 2019
+++ src/tests/usr.bin/cc/ubsan_common.subr Tue Jan 29 19:59:10 2019
@@ -0,0 +1,162 @@
+# $NetBSD: ubsan_common.subr,v 1.1 2019/01/29 19:59:10 mgorny Exp $
+#
+# Copyright (c) 2018, 2019 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+test_target()
+{
+ SUPPORT='n'
+ if ! echo __GNUC__ | cc -E - | grep -q __GNUC__; then
+ SUPPORT='y'
+ fi
+
+ if ! echo __clang__ | cc -E - | grep -q __clang__; then
+ SUPPORT='y'
+ fi
+}
+
+atf_test_case target_not_supported
+target_not_supported_head()
+{
+ atf_set "descr" "Test forced skip"
+}
+
+target_not_supported_body()
+{
+ atf_skip "Target is not supported"
+}
+
+# Add a new test case, with head & body.
+# asan_test_case <test-name> <description> <check-output>
+ubsan_test_case() {
+ atf_test_case "$1"
+ eval "$1_head() {
+ atf_set 'descr' 'Test Undefined Behavior for $2'
+ atf_set 'require.progs' 'cc'
+ }"
+
+ atf_test_case "$1_profile"
+ eval "$1_head() {
+ atf_set 'descr' 'Test Undefined Behavior for $2 with profiling option'
+ atf_set 'require.progs' 'cc'
+ }"
+
+ atf_test_case "$1_pic"
+ eval "$1_head() {
+ atf_set 'descr' 'Test Undefined Behavior for $2 with position independent code (PIC) flag'
+ atf_set 'require.progs' 'cc'
+ }"
+
+ atf_test_case "$1_pie"
+ eval "$1_head() {
+ atf_set 'descr' 'Test Undefined Behavior for $2 with position independent execution (PIE) flag'
+ atf_set 'require.progs' 'cc'
+ }"
+
+ atf_test_case "${1}32"
+ eval "$1_head() {
+ atf_set 'descr' 'Test Undefined Behavior for $2 in NetBSD_32 emulation'
+ atf_set 'require.progs' 'cc file diff cat'
+ }"
+
+ eval "$1_body() {
+ echo \"\$UBSAN_CODE\" > test.c
+ cc -fsanitize=undefined -o test test.c
+ # note: ignoring exit status due to inconsistency between gcc/clang
+ # (and between individual tests)
+ atf_check -s ignore -e match:'$3' ./test
+ }
+
+ $1_profile_body() {
+ echo \"\$UBSAN_CODE\" > test.c
+ cc -fsanitize=undefined -o test -pg test.c
+ atf_check -s ignore -e match:'$3' ./test
+ }
+
+ $1_pic_body() {
+ echo \"\$UBSAN_CODE\" > test.c
+ cc -DPIC_FOO -fsanitize=undefined -fPIC -shared -o libtest.so test.c
+ cc -DPIC_MAIN -o test test.c -fsanitize=undefined -L. -ltest
+
+ export LD_LIBRARY_PATH=.
+ atf_check -s ignore -e match:'$3' ./test
+ }
+
+ $1_pie_body() {
+ # check whether this arch supports -pice
+ if ! cc -pie -dM -E - < /dev/null 2>/dev/null >/dev/null; then
+ atf_set_skip 'cc -pie not supported on this architecture'
+ fi
+ echo \"\$UBSAN_CODE\" > test.c
+ cc -fsanitize=undefined -o test -fpie -pie test.c
+ atf_check -s ignore -e match:'$3' ./test
+ }
+
+ ${1}32_body() {
+ # check whether this arch is 64bit
+ if ! cc -dM -E - < /dev/null | fgrep -q _LP64; then
+ atf_skip 'this is not a 64 bit architecture'
+ fi
+ if ! cc -m32 -dM -E - < /dev/null 2>/dev/null > ./def32; then
+ atf_skip 'cc -m32 not supported on this architecture'
+ else
+ if fgrep -q _LP64 ./def32; then
+ atf_fail 'cc -m32 does not generate netbsd32 binaries'
+ fi
+ fi
+
+ echo \"\$UBSAN_CODE\" > test.c
+ cc -fsanitize=undefined -o df32 -m32 test.c
+ cc -fsanitize=undefined -o df64 test.c
+ file -b ./df32 > ./ftype32
+ file -b ./df64 > ./ftype64
+ if diff ./ftype32 ./ftype64 >/dev/null; then
+ atf_fail 'generated binaries do not differ'
+ fi
+ echo '32bit binaries on this platform are:'
+ cat ./ftype32
+ echo 'While native (64bit) binaries are:'
+ cat ./ftype64
+ atf_check -s ignore -e match:'$3' ./df32
+
+# and another test with profile 32bit binaries
+ cc -fsanitize=undefined -o test -pg -m32 test.c
+ atf_check -s ignore -e match:'$3' ./test
+ }"
+}
+
+ubsan_add_test_cases() {
+ test_target
+ test $SUPPORT = 'n' && {
+ atf_add_test_case target_not_supported
+ return 0
+ }
+
+ atf_add_test_case "$1"
+# atf_add_test_case "$1_profile"
+ atf_add_test_case "$1_pic"
+ atf_add_test_case "$1_pie"
+# atf_add_test_case "${1}32"
+}
