Module Name:    src
Committed By:   kamil
Date:           Wed May  2 18:46:05 UTC 2018

Modified Files:
        src/distrib/sets/lists/tests: mi
        src/tests/usr.bin/c++: Makefile
        src/tests/usr.bin/cc: Makefile
Added Files:
        src/tests/usr.bin/c++: 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
        src/tests/usr.bin/cc: 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

Log Message:
Add new ATF Undefined Behavior Sanitizer tests

Add new cc and c++ tests to check whether UBSan works.
These tests are prepared for GCC (in base) and Clang (with external patches).

Enable these tests for all ports by default, just verify whether we are
using GCC/Clang or a compatible compiler.

Add five equivalent C and C++ tests:
 - Integer addition overflow
 - Integer divide by zero
 - Integer negation overflow
 - Integer subtraction overflow
 - VLA out of bounds

All tests pass on NetBSD/amd64.

Patch submitted by <Harry Pantazis>
Minor cleanup by <myself>


To generate a diff of this commit:
cvs rdiff -u -r1.781 -r1.782 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.8 -r1.9 src/tests/usr.bin/c++/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/c++/t_ubsan_int_add_overflow.sh \
    src/tests/usr.bin/c++/t_ubsan_int_divzero.sh \
    src/tests/usr.bin/c++/t_ubsan_int_neg_overflow.sh \
    src/tests/usr.bin/c++/t_ubsan_int_sub_overflow.sh \
    src/tests/usr.bin/c++/t_ubsan_vla_out_of_bounds.sh
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/cc/Makefile
cvs rdiff -u -r0 -r1.1 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 \
    src/tests/usr.bin/cc/t_ubsan_vla_out_of_bounds.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.781 src/distrib/sets/lists/tests/mi:1.782
--- src/distrib/sets/lists/tests/mi:1.781	Wed Apr 11 03:25:25 2018
+++ src/distrib/sets/lists/tests/mi	Wed May  2 18:46:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.781 2018/04/11 03:25:25 kamil Exp $
+# $NetBSD: mi,v 1.782 2018/05/02 18:46:05 kamil Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -3641,6 +3641,11 @@
 ./usr/tests/usr.bin/c++/t_asan_off_by_one	tests-usr.bin-tests	compattestfile,atf,cxx
 ./usr/tests/usr.bin/c++/t_asan_poison		tests-usr.bin-tests	compattestfile,atf,cxx
 ./usr/tests/usr.bin/c++/t_asan_uaf		tests-usr.bin-tests	compattestfile,atf,cxx
+./usr/tests/usr.bin/c++/t_ubsan_int_add_overflow	tests-usr.bin-tests	compattestfile,atf,cxx
+./usr/tests/usr.bin/c++/t_ubsan_int_sub_overflow	tests-usr.bin-tests	compattestfile,atf,cxx
+./usr/tests/usr.bin/c++/t_ubsan_int_neg_overflow	tests-usr.bin-tests	compattestfile,atf,cxx
+./usr/tests/usr.bin/c++/t_ubsan_int_divzero	tests-usr.bin-tests	compattestfile,atf,cxx
+./usr/tests/usr.bin/c++/t_ubsan_vla_out_of_bounds	tests-usr.bin-tests	compattestfile,atf,cxx
 ./usr/tests/usr.bin/c++/t_call_once		tests-usr.bin-tests	compattestfile,atf,cxx
 ./usr/tests/usr.bin/c++/t_call_once2		tests-usr.bin-tests	compattestfile,atf,cxx
 ./usr/tests/usr.bin/c++/t_cxxruntime		tests-usr.bin-tests	compattestfile,atf,cxx
@@ -3657,6 +3662,11 @@
 ./usr/tests/usr.bin/cc/t_asan_off_by_one	tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/cc/t_asan_poison		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/cc/t_asan_uaf		tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/cc/t_ubsan_int_add_overflow		tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/cc/t_ubsan_int_sub_overflow		tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/cc/t_ubsan_int_neg_overflow		tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/cc/t_ubsan_int_divzero		tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/cc/t_ubsan_vla_out_of_bounds	tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/cmp				tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/cmp/Atffile			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/cmp/Kyuafile		tests-usr.bin-tests	compattestfile,atf,kyua

Index: src/tests/usr.bin/c++/Makefile
diff -u src/tests/usr.bin/c++/Makefile:1.8 src/tests/usr.bin/c++/Makefile:1.9
--- src/tests/usr.bin/c++/Makefile:1.8	Wed Apr 11 03:25:25 2018
+++ src/tests/usr.bin/c++/Makefile	Wed May  2 18:46:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2018/04/11 03:25:25 kamil Exp $
+# $NetBSD: Makefile,v 1.9 2018/05/02 18:46:05 kamil Exp $
 
 .include <bsd.own.mk>
 
@@ -11,6 +11,11 @@ TESTS_SH+=	t_asan_heap_overflow
 TESTS_SH+=	t_asan_off_by_one
 TESTS_SH+=	t_asan_poison
 TESTS_SH+=	t_asan_uaf
+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+=	t_call_once
 TESTS_SH+=	t_call_once2
 TESTS_SH+=	t_cxxruntime

Index: src/tests/usr.bin/cc/Makefile
diff -u src/tests/usr.bin/cc/Makefile:1.3 src/tests/usr.bin/cc/Makefile:1.4
--- src/tests/usr.bin/cc/Makefile:1.3	Wed Apr 11 03:25:25 2018
+++ src/tests/usr.bin/cc/Makefile	Wed May  2 18:46:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2018/04/11 03:25:25 kamil Exp $
+# $NetBSD: Makefile,v 1.4 2018/05/02 18:46:05 kamil Exp $
 
 .include <bsd.own.mk>
 
@@ -11,6 +11,11 @@ TESTS_SH+=	t_asan_heap_overflow
 TESTS_SH+=	t_asan_off_by_one
 TESTS_SH+=	t_asan_poison
 TESTS_SH+=	t_asan_uaf
+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+=	t_hello
 
 .include <bsd.test.mk>

Added files:

Index: src/tests/usr.bin/c++/t_ubsan_int_add_overflow.sh
diff -u /dev/null src/tests/usr.bin/c++/t_ubsan_int_add_overflow.sh:1.1
--- /dev/null	Wed May  2 18:46:05 2018
+++ src/tests/usr.bin/c++/t_ubsan_int_add_overflow.sh	Wed May  2 18:46:05 2018
@@ -0,0 +1,197 @@
+# Copyright (c) 2018 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Harry Pantazis.
+#
+# 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__ | c++ -E - | grep -q __GNUC__; then
+		SUPPORT='y'
+	fi
+
+	if ! echo __clang__ | c++ -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" "c++"
+}
+
+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" "c++"
+}
+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" "c++"
+}
+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" "c++"
+}
+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" "c++ 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
+
+	c++ -fsanitize=undefined -o test test.c
+	atf_check -e match:"signed integer overflow" ./test
+}
+
+int_add_overflow_profile_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
+
+	c++ -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>
+int help(int count) {volatile int l = INT_MAX; l+= count; return l;}
+EOF
+
+	c++ -fsanitize=undefined -fPIC -shared -o libtest.so pic.c
+	c++ -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 ! c++ -pie -dM -E - < /dev/null 2>/dev/null >/dev/null; then
+		atf_set_skip "c++ -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
+
+	c++ -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 ! c++ -dM -E - < /dev/null | grep -F -q _LP64; then
+		atf_skip "This is not a 64 bit architecture"
+	fi
+	if ! c++ -m32 -dM -E - < /dev/null 2>/dev/null > ./def32; then
+		atf_skip "c++ -m32 Not supported on this architecture"
+	else
+		if grep -F -q _LP64 ./def32; then
+		atf_fail "c++ -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
+
+	c++ -fsanitize=undefined -o md32 -m32 test.c
+	c++ -fsanitize=undefined -o md64 test.c
+	file -b ./md32 > ./ftype32
+	file -b ./md64 > ./ftype64
+	if diff ./ftype32 ./ftype64 >/dev/null; then
+		atf_fail "Generated binz ain't no different"
+	fi
+	echo "32bit Binz on this platform are:"
+	cat ./ftype32
+	echo "64bit Binz 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
+
+	c++ -fsanitize=undefined -pg -m32 -o test test.c
+	atf_check -e match:"signed integer overflow" ./test
+}
+
+atf_test_case target_not_supported
+target_not_supported_head()
+{
+	atf_set "descr" "Test forced skip"
+}
+
+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
+}
Index: src/tests/usr.bin/c++/t_ubsan_int_divzero.sh
diff -u /dev/null src/tests/usr.bin/c++/t_ubsan_int_divzero.sh:1.1
--- /dev/null	Wed May  2 18:46:05 2018
+++ src/tests/usr.bin/c++/t_ubsan_int_divzero.sh	Wed May  2 18:46:05 2018
@@ -0,0 +1,190 @@
+# Copyright (c) 2018 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Harry Pantazis.
+#
+# 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__ | c++ -E - | grep -q __GNUC__; then 
+		SUPPORT='y'
+	fi
+
+	if ! echo __clang__ | c++ -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" "c++"
+}
+
+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" "c++"
+}
+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" "c++"
+}
+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" "c++"
+}
+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" "c++ 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
+
+	c++ -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
+
+	c++ -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
+#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>
+int help(int count) {volatile int l = count; volatile int k = 0; return l/k;}
+EOF
+
+	c++ -fsanitize=integer-divide-by-zero -fPIC -shared -o libtest.so pic.c
+	c++ -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 ! c++ -pie -dM -E - < /dev/null 2>/dev/null >/dev/null; then 
+		atf_set_skip "c++ -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
+
+	c++ -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 ! c++ -dM -E - < /dev/null | grep -F -q _LP64; then
+		atf_skip "This is not a 64 bit architecture"
+	fi
+	if ! c++ -m32 -dM -E - < /dev/null 2>/dev/null > ./def32; then
+		atf_skip "c++ -m32 Not supported on this architecture"
+	else
+		if grep -F -q _LP64 ./def32; then
+		atf_fail "c++ -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
+
+	c++ -fsanitize=integer-divide-by-zero -o md32 -m32 test.c
+	c++ -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 binz ain't no different"
+	fi
+	echo "32bit Binz on this platform are:"
+	cat ./ftype32
+	echo "64bit Binz 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
+
+	c++ -fsanitize=integer-divide-by-zero -pg -m32 -o test test.c
+	atf_check -s signal:8  -e match:"division by zero" ./test
+}
+
+atf_test_case target_not_supported
+target_not_supported_head()
+{
+	atf_set "descr" "Test forced skip"
+}
+
+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
+}
Index: src/tests/usr.bin/c++/t_ubsan_int_neg_overflow.sh
diff -u /dev/null src/tests/usr.bin/c++/t_ubsan_int_neg_overflow.sh:1.1
--- /dev/null	Wed May  2 18:46:05 2018
+++ src/tests/usr.bin/c++/t_ubsan_int_neg_overflow.sh	Wed May  2 18:46:05 2018
@@ -0,0 +1,197 @@
+# Copyright (c) 2018 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Harry Pantazis.
+#
+# 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__ | c++ -E - | grep -q __GNUC__; then
+		SUPPORT='y'
+	fi
+
+	if ! echo __clang__ | c++ -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" "c++"
+}
+
+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" "c++"
+}
+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" "c++"
+}
+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" "c++"
+}
+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" "c++ 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
+
+	c++ -fsanitize=undefined -o test test.c
+	atf_check -e match:"negation of" ./test
+}
+
+int_neg_overflow_profile_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
+
+	c++ -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>
+int help(int count) {volatile int l = INT_MIN; l = -l; return l;}
+EOF
+
+	c++ -fsanitize=undefined -fPIC -shared -o libtest.so pic.c
+	c++ -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 ! c++ -pie -dM -E - < /dev/null 2>/dev/null >/dev/null; then
+		atf_set_skip "c++ -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
+
+	c++ -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 ! c++ -dM -E - < /dev/null | grep -F -q _LP64; then
+		atf_skip "This is not a 64 bit architecture"
+	fi
+	if ! c++ -m32 -dM -E - < /dev/null 2>/dev/null > ./def32; then
+		atf_skip "c++ -m32 Not supported on this architecture"
+	else
+		if grep -F -q _LP64 ./def32; then
+		atf_fail "c++ -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
+
+	c++ -fsanitize=undefined -o md32 -m32 test.c
+	c++ -fsanitize=undefined -o md64 test.c
+	file -b ./md32 > ./ftype32
+	file -b ./md64 > ./ftype64
+	if diff ./ftype32 ./ftype64 >/dev/null; then
+		atf_fail "Generated binz ain't no different"
+	fi
+	echo "32bit Binz on this platform are:"
+	cat ./ftype32
+	echo "64bit Binz 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
+
+	c++ -fsanitize=undefined -pg -m32 -o test test.c
+	atf_check -e match:"negation of" ./test
+}
+
+atf_test_case target_not_supported
+target_not_supported_head()
+{
+	atf_set "descr" "Test forced skip"
+}
+
+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
+}
Index: src/tests/usr.bin/c++/t_ubsan_int_sub_overflow.sh
diff -u /dev/null src/tests/usr.bin/c++/t_ubsan_int_sub_overflow.sh:1.1
--- /dev/null	Wed May  2 18:46:05 2018
+++ src/tests/usr.bin/c++/t_ubsan_int_sub_overflow.sh	Wed May  2 18:46:05 2018
@@ -0,0 +1,197 @@
+# Copyright (c) 2018 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Harry Pantazis.
+#
+# 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__ | c++ -E - | grep -q __GNUC__; then
+		SUPPORT='y'
+	fi
+
+	if ! echo __clang__ | c++ -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" "c++"
+}
+
+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" "c++"
+}
+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" "c++"
+}
+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" "c++"
+}
+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" "c++ 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
+
+	c++ -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
+#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
+
+	c++ -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>
+int help(int count) {volatile int l = INT_MIN; l-= count; return l;}
+EOF
+
+	c++ -fsanitize=undefined -fPIC -shared -o libtest.so pic.c
+	c++ -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 ! c++ -pie -dM -E - < /dev/null 2>/dev/null >/dev/null; then
+		atf_set_skip "c++ -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
+
+	c++ -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 ! c++ -dM -E - < /dev/null | grep -F -q _LP64; then
+		atf_skip "This is not a 64 bit architecture"
+	fi
+	if ! c++ -m32 -dM -E - < /dev/null 2>/dev/null > ./def32; then
+		atf_skip "c++ -m32 Not supported on this architecture"
+	else
+		if grep -F -q _LP64 ./def32; then
+		atf_fail "c++ -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
+
+	c++ -fsanitize=undefined -o md32 -m32 test.c
+	c++ -fsanitize=undefined -o md64 test.c
+	file -b ./md32 > ./ftype32
+	file -b ./md64 > ./ftype64
+	if diff ./ftype32 ./ftype64 >/dev/null; then
+		atf_fail "Generated binz ain't no different"
+	fi
+	echo "32bit Binz on this platform are:"
+	cat ./ftype32
+	echo "64bit Binz 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
+
+	c++ -fsanitize=undefined -pg -m32 -o test test.c
+	atf_check -s ignore -e match:"signed integer overflow" ./test
+}
+
+atf_test_case target_not_supported
+target_not_supported_head()
+{
+	atf_set "descr" "Test forced skip"
+}
+
+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
+}
Index: src/tests/usr.bin/c++/t_ubsan_vla_out_of_bounds.sh
diff -u /dev/null src/tests/usr.bin/c++/t_ubsan_vla_out_of_bounds.sh:1.1
--- /dev/null	Wed May  2 18:46:05 2018
+++ src/tests/usr.bin/c++/t_ubsan_vla_out_of_bounds.sh	Wed May  2 18:46:05 2018
@@ -0,0 +1,194 @@
+# Copyright (c) 2018 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Harry Pantazis.
+#
+# 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__ | c++ -E - | grep -q __GNUC__; then
+		SUPPORT='y'
+	fi
+
+	if ! echo __clang__ | c++ -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 out of bounds"
+	atf_set "require.progs" "c++"
+}
+
+atf_test_case vla_out_of_bounds_profile
+vla_out_of_bounds_profile_head() {
+	atf_set "descr" "Test Undefined Behavior for vla out of bounds with profiling option"
+	atf_set "require.progs" "c++"
+}
+atf_test_case vla_out_of_bounds_pic
+vla_out_of_bounds_pic_head() {
+	atf_set "descr" "Test Undefined Behavior for vla out of bounds with position independent code (PIC) flag"
+	atf_set "require.progs" "c++"
+}
+atf_test_case vla_out_of_bounds_pie
+vla_out_of_bounds_pie_head() {
+	atf_set "descr" "Test Undefined Behavior for vla out of bounds with position independent execution (PIE) flag"
+	atf_set "require.progs" "c++"
+}
+atf_test_case vla_out_of_bounds32
+vla_out_of_bounds32_head() {
+	atf_set "descr" "Test Undefined Behavior for vla out of bounds in NetBSD_32 emulation"
+	atf_set "require.progs" "c++ 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
+
+	c++ -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
+
+	c++ -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
+#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>
+void help(int count) {volatile int val1 = count, val2 = count+1; volatile int arr[val1]; arr[val2] = count; }
+EOF
+
+	c++ -fsanitize=undefined -fPIC -shared -o libtest.so pic.c
+	c++ -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 ! c++ -pie -dM -E - < /dev/null 2>/dev/null >/dev/null; then
+		atf_set_skip "c++ -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
+
+	c++ -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 ! c++ -dM -E - < /dev/null | grep -F -q _LP64; then
+		atf_skip "This is not a 64 bit architecture"
+	fi
+	if ! c++ -m32 -dM -E - < /dev/null 2>/dev/null > ./def32; then
+		atf_skip "c++ -m32 Not supported on this architecture"
+	else
+		if grep -F -q _LP64 ./def32; then
+		atf_fail "c++ -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
+
+	c++ -fsanitize=undefined -o md32 -m32 test.c
+	c++ -fsanitize=undefined -o md64 test.c
+	file -b ./md32 > ./ftype32
+	file -b ./md64 > ./ftype64
+	if diff ./ftype32 ./ftype64 >/dev/null; then
+		atf_fail "Generated binz ain't no different"
+	fi
+	echo "32bit Binz on this platform are:"
+	cat ./ftype32
+	echo "64bit Binz 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
+
+	c++ -fsanitize=undefined -pg -m32 -o test test.c
+	atf_check -e match:"out of bounds" ./test
+}
+
+atf_test_case target_not_supported
+target_not_supported_head()
+{
+	atf_set "descr" "Test forced skip"
+}
+
+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
+}

Index: src/tests/usr.bin/cc/t_ubsan_int_add_overflow.sh
diff -u /dev/null src/tests/usr.bin/cc/t_ubsan_int_add_overflow.sh:1.1
--- /dev/null	Wed May  2 18:46:05 2018
+++ src/tests/usr.bin/cc/t_ubsan_int_add_overflow.sh	Wed May  2 18:46:05 2018
@@ -0,0 +1,197 @@
+# Copyright (c) 2018 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Harry Pantazis.
+#
+# 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 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
+#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>
+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 binz ain't no different"
+	fi
+	echo "32bit Binz on this platform are:"
+	cat ./ftype32
+	echo "64bit Binz 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
+}
+
+atf_test_case target_not_supported
+target_not_supported_head()
+{
+	atf_set "descr" "Test forced skip"
+}
+
+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
+}
Index: src/tests/usr.bin/cc/t_ubsan_int_divzero.sh
diff -u /dev/null src/tests/usr.bin/cc/t_ubsan_int_divzero.sh:1.1
--- /dev/null	Wed May  2 18:46:05 2018
+++ src/tests/usr.bin/cc/t_ubsan_int_divzero.sh	Wed May  2 18:46:05 2018
@@ -0,0 +1,190 @@
+# Copyright (c) 2018 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Harry Pantazis.
+#
+# 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 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
+#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>
+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 binz ain't no different"
+	fi
+	echo "32bit Binz on this platform are:"
+	cat ./ftype32
+	echo "64bit Binz 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
+}
+
+atf_test_case target_not_supported
+target_not_supported_head()
+{
+	atf_set "descr" "Test forced skip"
+}
+
+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
+}
Index: src/tests/usr.bin/cc/t_ubsan_int_neg_overflow.sh
diff -u /dev/null src/tests/usr.bin/cc/t_ubsan_int_neg_overflow.sh:1.1
--- /dev/null	Wed May  2 18:46:05 2018
+++ src/tests/usr.bin/cc/t_ubsan_int_neg_overflow.sh	Wed May  2 18:46:05 2018
@@ -0,0 +1,197 @@
+# Copyright (c) 2018 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Harry Pantazis.
+#
+# 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 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
+#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>
+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 binz ain't no different"
+	fi
+	echo "32bit Binz on this platform are:"
+	cat ./ftype32
+	echo "64bit Binz 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
+}
+
+atf_test_case target_not_supported
+target_not_supported_head()
+{
+	atf_set "descr" "Test forced skip"
+}
+
+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
+}
Index: src/tests/usr.bin/cc/t_ubsan_int_sub_overflow.sh
diff -u /dev/null src/tests/usr.bin/cc/t_ubsan_int_sub_overflow.sh:1.1
--- /dev/null	Wed May  2 18:46:05 2018
+++ src/tests/usr.bin/cc/t_ubsan_int_sub_overflow.sh	Wed May  2 18:46:05 2018
@@ -0,0 +1,197 @@
+# Copyright (c) 2018 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Harry Pantazis.
+#
+# 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 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
+#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>
+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 binz ain't no different"
+	fi
+	echo "32bit Binz on this platform are:"
+	cat ./ftype32
+	echo "64bit Binz 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
+}
+
+atf_test_case target_not_supported
+target_not_supported_head()
+{
+	atf_set "descr" "Test forced skip"
+}
+
+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
+}
Index: src/tests/usr.bin/cc/t_ubsan_vla_out_of_bounds.sh
diff -u /dev/null src/tests/usr.bin/cc/t_ubsan_vla_out_of_bounds.sh:1.1
--- /dev/null	Wed May  2 18:46:05 2018
+++ src/tests/usr.bin/cc/t_ubsan_vla_out_of_bounds.sh	Wed May  2 18:46:05 2018
@@ -0,0 +1,194 @@
+# Copyright (c) 2018 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Harry Pantazis.
+#
+# 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 vla_out_of_bounds
+vla_out_of_bounds_head() {
+	atf_set "descr" "Test Undefined Behavior for vla 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 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 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 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 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
+#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>
+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 binz ain't no different"
+	fi
+	echo "32bit Binz on this platform are:"
+	cat ./ftype32
+	echo "64bit Binz 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
+}
+
+atf_test_case target_not_supported
+target_not_supported_head()
+{
+	atf_set "descr" "Test forced skip"
+}
+
+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
+}

Reply via email to