[src/trunk]: src/tests/sbin/setkey Verify that PR kern/52150 is no longer pre...

[jruoho <jruoho%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b81357a253c9
branches:  trunk
changeset: 1011315:b81357a253c9
user:      jruoho <jruoho%NetBSD.org@localhost>
date:      Thu Jun 25 17:08:32 2020 +0000

description:
Verify that PR kern/52150 is no longer present.

diffstat:

 distrib/sets/lists/tests/mi   |   6 ++++-
 etc/mtree/NetBSD.dist.tests   |   3 +-
 tests/sbin/Makefile           |   4 +-
 tests/sbin/setkey/Makefile    |   9 ++++++++
 tests/sbin/setkey/t_setkey.sh |  47 +++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 65 insertions(+), 4 deletions(-)

diffs (118 lines):

diff -r 675429f9d7e0 -r b81357a253c9 distrib/sets/lists/tests/mi
--- a/distrib/sets/lists/tests/mi       Thu Jun 25 17:01:19 2020 +0000
+++ b/distrib/sets/lists/tests/mi       Thu Jun 25 17:08:32 2020 +0000
@@ -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
diff -r 675429f9d7e0 -r b81357a253c9 etc/mtree/NetBSD.dist.tests
--- a/etc/mtree/NetBSD.dist.tests       Thu Jun 25 17:01:19 2020 +0000
+++ b/etc/mtree/NetBSD.dist.tests       Thu Jun 25 17:08:32 2020 +0000
@@ -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
diff -r 675429f9d7e0 -r b81357a253c9 tests/sbin/Makefile
--- a/tests/sbin/Makefile       Thu Jun 25 17:01:19 2020 +0000
+++ b/tests/sbin/Makefile       Thu Jun 25 17:08:32 2020 +0000
@@ -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 @@
 
 TESTS_SUBDIRS+=        envstat fsck_ffs gpt ifconfig \
                newfs newfs_msdos resize_ffs \
-               route sysctl
+               route setkey sysctl
 
 .include <bsd.test.mk>
diff -r 675429f9d7e0 -r b81357a253c9 tests/sbin/setkey/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/sbin/setkey/Makefile        Thu Jun 25 17:08:32 2020 +0000
@@ -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>
diff -r 675429f9d7e0 -r b81357a253c9 tests/sbin/setkey/t_setkey.sh
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/sbin/setkey/t_setkey.sh     Thu Jun 25 17:08:32 2020 +0000
@@ -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
+}