From 2a70c174953624527a34b0c7009c769b04f54111 Mon Sep 17 00:00:00 2001 From: jruoho Date: Thu, 25 Jun 2020 16:16:48 +0000 Subject: [PATCH] Add a test case for PR kern/52744, which no longer appears to be present. --- distrib/sets/lists/tests/mi | 3 +- tests/kernel/Makefile | 3 +- tests/kernel/t_nointerpreter.sh | 59 +++++++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+), 2 deletions(-) create mode 100644 tests/kernel/t_nointerpreter.sh diff --git a/distrib/sets/lists/tests/mi b/distrib/sets/lists/tests/mi index a46322cb09e5..cb37ac8b859d 100644 --- a/distrib/sets/lists/tests/mi +++ b/distrib/sets/lists/tests/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.851 2020/06/25 15:41:40 jruoho Exp $ +# $NetBSD: mi,v 1.852 2020/06/25 16:16:49 jruoho Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -2200,6 +2200,7 @@ ./usr/tests/kernel/t_lwpctl tests-obsolete obsolete ./usr/tests/kernel/t_mkdir tests-obsolete obsolete ./usr/tests/kernel/t_mqueue tests-kernel-tests compattestfile,atf +./usr/tests/kernel/t_nointerpreter tests-kernel-tests atf ./usr/tests/kernel/t_origin tests-kernel-tests compattestfile,atf ./usr/tests/kernel/t_pipe tests-obsolete obsolete ./usr/tests/kernel/t_poll3w tests-obsolete obsolete diff --git a/tests/kernel/Makefile b/tests/kernel/Makefile index 09b6884f0148..4c7788da64c4 100644 --- a/tests/kernel/Makefile +++ b/tests/kernel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.66 2020/03/01 18:08:15 christos Exp $ +# $NetBSD: Makefile,v 1.67 2020/06/25 16:16:48 jruoho Exp $ NOMAN= # defined @@ -26,6 +26,7 @@ TESTS_SH+= t_umountstress TESTS_SH+= t_ps_strings TESTS_SH+= t_trapsignal TESTS_SH+= t_interp +TESTS_SH+= t_nointerpreter TESTS_SH+= t_origin TESTS_SH+= t_procpath TESTS_SH+= t_fexecve diff --git a/tests/kernel/t_nointerpreter.sh b/tests/kernel/t_nointerpreter.sh new file mode 100644 index 000000000000..76ea45cea25a --- /dev/null +++ b/tests/kernel/t_nointerpreter.sh @@ -0,0 +1,59 @@ +# $NetBSD: t_nointerpreter.sh,v 1.1 2020/06/25 16:16:48 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. +# +tmp="/tmp/nointerpreter" + +atf_test_case nointerpreter cleanup +nointerpreter_head() { + atf_set "descr" "Check that executing shell scripts without a " \ + "specified interpreter does not spam (PR kern/52744)" +} + +nointerpreter_body() { + + echo "echo hello world" > $tmp + chmod u+x $tmp + . $tmp + spam=$(dmesg | grep "check exec failed") + + if [ ! -z $spam ]; then + atf_fail "Kernel spams harmless diagnostics" + fi +} + +nointerpreter_cleanup() { + + if [ -f $tmp ]; then + rm $tmp + fi +} + +atf_init_test_cases() { + atf_add_test_case nointerpreter +}