Module Name: src
Committed By: jruoho
Date: Thu Jun 25 17:08:33 UTC 2020
Modified Files:
src/distrib/sets/lists/tests: mi
src/etc/mtree: NetBSD.dist.tests
src/tests/sbin: Makefile
Added Files:
src/tests/sbin/setkey: Makefile t_setkey.sh
Log Message:
Verify that PR kern/52150 is no longer present.
To generate a diff of this commit:
cvs rdiff -u -r1.852 -r1.853 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.167 -r1.168 src/etc/mtree/NetBSD.dist.tests
cvs rdiff -u -r1.8 -r1.9 src/tests/sbin/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/sbin/setkey/Makefile \
src/tests/sbin/setkey/t_setkey.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.852 src/distrib/sets/lists/tests/mi:1.853
--- src/distrib/sets/lists/tests/mi:1.852 Thu Jun 25 16:16:49 2020
+++ src/distrib/sets/lists/tests/mi Thu Jun 25 17:08:33 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.852 2020/06/25 16:16:49 jruoho Exp $
+# $NetBSD: mi,v 1.853 2020/06/25 17:08:33 jruoho Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -4021,6 +4021,10 @@
./usr/tests/sbin/route/Atffile tests-sbin-tests compattestfile,atf
./usr/tests/sbin/route/Kyuafile tests-sbin-tests compattestfile,atf,kyua
./usr/tests/sbin/route/t_missing tests-sbin-tests compattestfile,atf
+./usr/tests/sbin/setkey tests-sbin-tests compattestfile,atf
+./usr/tests/sbin/setkey/Atffile tests-sbin-tests compattestfile,atf
+./usr/tests/sbin/setkey/Kyuafile tests-sbin-tests compattestfile,atf,kyua
+./usr/tests/sbin/setkey/t_setkey tests-sbin-tests compattestfile,atf
./usr/tests/sbin/sysctl tests-sbin-tests compattestfile,atf
./usr/tests/sbin/sysctl/Atffile tests-sbin-tests compattestfile,atf
./usr/tests/sbin/sysctl/Kyuafile tests-sbin-tests compattestfile,atf,kyua
Index: src/etc/mtree/NetBSD.dist.tests
diff -u src/etc/mtree/NetBSD.dist.tests:1.167 src/etc/mtree/NetBSD.dist.tests:1.168
--- src/etc/mtree/NetBSD.dist.tests:1.167 Thu Jun 25 15:01:35 2020
+++ src/etc/mtree/NetBSD.dist.tests Thu Jun 25 17:08:33 2020
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.tests,v 1.167 2020/06/25 15:01:35 jruoho Exp $
+# $NetBSD: NetBSD.dist.tests,v 1.168 2020/06/25 17:08:33 jruoho Exp $
./usr/libdata/debug/usr/tests
./usr/libdata/debug/usr/tests/atf
@@ -379,6 +379,7 @@
./usr/tests/sbin/newfs_msdos
./usr/tests/sbin/resize_ffs
./usr/tests/sbin/route
+./usr/tests/sbin/setkey
./usr/tests/sbin/sysctl
./usr/tests/share
./usr/tests/share/examples
Index: src/tests/sbin/Makefile
diff -u src/tests/sbin/Makefile:1.8 src/tests/sbin/Makefile:1.9
--- src/tests/sbin/Makefile:1.8 Thu Jun 25 15:01:35 2020
+++ src/tests/sbin/Makefile Thu Jun 25 17:08:32 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2020/06/25 15:01:35 jruoho Exp $
+# $NetBSD: Makefile,v 1.9 2020/06/25 17:08:32 jruoho Exp $
#
.include <bsd.own.mk>
@@ -7,6 +7,6 @@ TESTSDIR= ${TESTSBASE}/sbin
TESTS_SUBDIRS+= envstat fsck_ffs gpt ifconfig \
newfs newfs_msdos resize_ffs \
- route sysctl
+ route setkey sysctl
.include <bsd.test.mk>
Added files:
Index: src/tests/sbin/setkey/Makefile
diff -u /dev/null src/tests/sbin/setkey/Makefile:1.1
--- /dev/null Thu Jun 25 17:08:33 2020
+++ src/tests/sbin/setkey/Makefile Thu Jun 25 17:08:32 2020
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile,v 1.1 2020/06/25 17:08:32 jruoho Exp $
+
+.include <bsd.own.mk>
+
+TESTSDIR= ${TESTSBASE}/sbin/setkey
+
+TESTS_SH= t_setkey
+
+.include <bsd.test.mk>
Index: src/tests/sbin/setkey/t_setkey.sh
diff -u /dev/null src/tests/sbin/setkey/t_setkey.sh:1.1
--- /dev/null Thu Jun 25 17:08:33 2020
+++ src/tests/sbin/setkey/t_setkey.sh Thu Jun 25 17:08:32 2020
@@ -0,0 +1,47 @@
+# $NetBSD: t_setkey.sh,v 1.1 2020/06/25 17:08:32 jruoho Exp $
+#
+# Copyright (c) 2020 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Jukka Ruohonen.
+#
+# 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.
+#
+
+atf_test_case invalid_length
+invalid_length_head() {
+ atf_require_prog "setkey"
+ atf_set "require.user" "root"
+ atf_set "descr" "Test with setkey(8) that setting a key " \
+ "with invalid length does not panic (PR kern/52150)"
+}
+
+invalid_length_body() {
+ atf_check -s exit:1 -o ignore -e not-empty \
+ -x "setkey add 10.0.0.1 10.0.0.2 esp 10000 " \
+ "-E aes-gmac \"hogehogehogehogehogehoge\""
+}
+
+atf_init_test_cases() {
+ atf_add_test_case invalid_length
+}
