Module Name: src
Committed By: jruoho
Date: Tue Jun 30 11:48:20 UTC 2020
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/sbin/ifconfig: Makefile
Added Files:
src/tests/sbin/ifconfig: t_repeated_link_addr.sh t_repeated_mtu.sh
Log Message:
Add a couple of tests for sequential ifconfig(8) options, incl. PR kern/41912.
To generate a diff of this commit:
cvs rdiff -u -r1.863 -r1.864 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.8 -r1.9 src/tests/sbin/ifconfig/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/sbin/ifconfig/t_repeated_link_addr.sh \
src/tests/sbin/ifconfig/t_repeated_mtu.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.863 src/distrib/sets/lists/tests/mi:1.864
--- src/distrib/sets/lists/tests/mi:1.863 Mon Jun 29 23:44:01 2020
+++ src/distrib/sets/lists/tests/mi Tue Jun 30 11:48:20 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.863 2020/06/29 23:44:01 riastradh Exp $
+# $NetBSD: mi,v 1.864 2020/06/30 11:48:20 jruoho Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -4001,6 +4001,8 @@
./usr/tests/sbin/ifconfig/t_capabilities tests-sbin-tests compattestfile,atf
./usr/tests/sbin/ifconfig/t_nonexistent tests-sbin-tests compattestfile,atf
./usr/tests/sbin/ifconfig/t_random_garbage tests-sbin-tests compattestfile,atf
+./usr/tests/sbin/ifconfig/t_repeated_link_addr tests-sbin-tests compattestfile,atf
+./usr/tests/sbin/ifconfig/t_repeated_mtu tests-sbin-tests compattestfile,atf
./usr/tests/sbin/ifconfig/t_repeated_scan tests-sbin-tests compattestfile,atf
./usr/tests/sbin/ifconfig/t_repeated_updown tests-sbin-tests compattestfile,atf
./usr/tests/sbin/ifconfig/t_tap tests-sbin-tests compattestfile,atf
Index: src/tests/sbin/ifconfig/Makefile
diff -u src/tests/sbin/ifconfig/Makefile:1.8 src/tests/sbin/ifconfig/Makefile:1.9
--- src/tests/sbin/ifconfig/Makefile:1.8 Sat Jun 27 13:53:43 2020
+++ src/tests/sbin/ifconfig/Makefile Tue Jun 30 11:48:20 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2020/06/27 13:53:43 jruoho Exp $
+# $NetBSD: Makefile,v 1.9 2020/06/30 11:48:20 jruoho Exp $
.include <bsd.own.mk>
@@ -8,6 +8,8 @@ TESTS_SH= t_bridge \
t_capabilities \
t_nonexistent \
t_random_garbage \
+ t_repeated_link_addr \
+ t_repeated_mtu \
t_repeated_scan \
t_repeated_updown \
t_tap \
Added files:
Index: src/tests/sbin/ifconfig/t_repeated_link_addr.sh
diff -u /dev/null src/tests/sbin/ifconfig/t_repeated_link_addr.sh:1.1
--- /dev/null Tue Jun 30 11:48:20 2020
+++ src/tests/sbin/ifconfig/t_repeated_link_addr.sh Tue Jun 30 11:48:20 2020
@@ -0,0 +1,120 @@
+# $NetBSD: t_repeated_link_addr.sh,v 1.1 2020/06/30 11:48:20 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 repeated_link_addr
+repeated_link_addr_head() {
+ atf_set "require.user" "root"
+ atf_set "descr" "Check with ifconfig(8) that " \
+ "setting link addresses for active interfaces " \
+ "does not cause a panic (PR kern/41912)"
+}
+
+repeated_link_addr_body() {
+
+ fail=0
+ addrs="00:11:00:00:00:00 \
+ 00:11:11:00:00:00 \
+ 00:11:11:11:00:00 \
+ 00:11:11:11:11:00 \
+ 00:00:11:00:00:00 \
+ 00:00:11:11:00:00 \
+ 00:00:11:11:11:00 \
+ 00:00:00:11:00:00 \
+ 00:00:00:11:11:00"
+
+ pkill -9 hostapd
+ pkill -9 wpa_supplicant
+
+ for i in $(ifconfig -l); do
+
+ state="up"
+ addr=$(ifconfig $i | grep "address")
+ addr=$(echo $addr | sed "s/address: //" | sed 's/ //')
+
+ if [ -z "$addr" ]; then
+ echo "Skipping $i"
+ continue
+ fi
+
+ ifconfig -s $i
+
+ if [ $? -eq 1 ]; then
+ state="down"
+ ifconfig $i up
+ sleep 1
+ fi
+
+ for j in $addrs; do
+
+ echo "Request: ifconfig $i link $j active"
+ ifconfig $i link $j active
+
+ if [ ! $? -eq 0 ]; then
+ fail=1
+ fi
+
+ if [ -z "$(ifconfig $i | grep $j)" ]; then
+ fail=1
+ fi
+
+ sleep 0.5
+ done
+
+ # From the ifconfig(8) manual page:
+ #
+ # "You may not delete the active address from an interface.
+ # You must activate some other address, first."
+ #
+ ifconfig $i link $addr active
+ echo "Restored the link address of $i to $addr"
+ sleep 0.5
+
+ for j in $addrs; do
+ echo "Request: ifconfig $i link $j delete"
+ ifconfig $i link $j delete
+ sleep 0.5
+ done
+
+ ifconfig $i $state
+ echo "Restored state of $i to $state"
+ done
+
+ /bin/sh /etc/rc.d/hostapd restart >/dev/null 2>&1
+ /bin/sh /etc/rc.d/wpa_supplicant restart >/dev/null 2>&1
+
+ if [ $fail -eq 1 ]; then
+ atf_fail "Failed to set link addresses"
+ fi
+
+ atf_pass
+}
+
+atf_init_test_cases() {
+ atf_add_test_case repeated_link_addr
+}
Index: src/tests/sbin/ifconfig/t_repeated_mtu.sh
diff -u /dev/null src/tests/sbin/ifconfig/t_repeated_mtu.sh:1.1
--- /dev/null Tue Jun 30 11:48:20 2020
+++ src/tests/sbin/ifconfig/t_repeated_mtu.sh Tue Jun 30 11:48:20 2020
@@ -0,0 +1,65 @@
+# $NetBSD: t_repeated_mtu.sh,v 1.1 2020/06/30 11:48:20 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 repeated_mtu
+repeated_mtu_head() {
+ atf_set "require.user" "root"
+ atf_set "descr" "Check with ifconfig(8) that setting MTUs works"
+}
+
+repeated_mtu_body() {
+
+ # This sequence covers both valid and invalid MTUs; we are
+ # only interested in testing that the system does not hang.
+ #
+ mtus=$(seq -10000 1000 90000)
+
+ for i in $(ifconfig -l); do
+
+ mtu=$(ifconfig $i | grep "mtu" | sed "s/.*mtu //")
+
+ if [ -z $mtu ]; then
+ echo "Skipping $i"
+ continue
+ fi
+
+ for j in $mtus; do
+ echo "Request: ifconfig $i mtu $j"
+ ifconfig $i mtu $j >/dev/null 2>&1
+ done
+
+ ifconfig $i mtu $mtu
+ echo "Restored the MTU of $i to $mtu"
+ done
+}
+
+atf_init_test_cases() {
+ atf_add_test_case repeated_mtu
+}
