 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_wg.c,v 1.24 2020/08/26 16:03:41 riastradh Exp $	*/
+/*	$NetBSD: if_wg.c,v 1.25 2020/08/27 02:52:33 riastradh Exp $	*/
 /*
  * Copyright (C) Ryota Ozaki <ozaki.ryota@gmail.com>
  * All rights reserved.
+ *
  * 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.
 @@ -31,27 +31,27 @@
 /*
  * This network interface aims to implement the WireGuard protocol.
  * The implementation is based on the paper of WireGuard as of
  * 2018-06-30 [1].  The paper is referred in the source code with label
  * [W].  Also the specification of the Noise protocol framework as of
  * 2018-07-11 [2] is referred with label [N].
+ *
  * [1] https://www.wireguard.com/papers/wireguard.pdf
  * [2] http://noiseprotocol.org/noise.pdf
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wg.c,v 1.24 2020/08/26 16:03:41 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wg.c,v 1.25 2020/08/27 02:52:33 riastradh Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 @@ -2905,29 +2905,45 @@ wg_so_upcall(struct socket *so, void *ar
 	wg_wakeup_worker(wgw, reason);
+}
 static int
 wg_overudp_cb(struct mbuf **mp, int offset, struct socket *so,
     struct sockaddr *src, void *arg)
+{
 	struct wg_softc *wg = arg;
 	struct wg_msg wgm;
 	struct mbuf *m = *mp;
 	WG_TRACE("enter");
 	/* Verify the mbuf chain is long enough to have a wg msg header.  */
 	KASSERT(offset <= m_length(m));
 	if (__predict_false(m_length(m) - offset < sizeof(struct wg_msg))) {
 		m_freem(m);
 		return -1;
+	}
 	/*
 	 * Copy the message header (32-bit message type) out -- we'll
 	 * worry about contiguity and alignment later.
 	 */
 	m_copydata(m, offset, sizeof(struct wg_msg), &wgm);
 	WG_DLOG("type=%d\n", wgm.wgm_type);
 	/*
 	 * Handle DATA packets promptly as they arrive.  Other packets
 	 * may require expensive public-key crypto and are not as
 	 * sensitive to latency, so defer them to the worker thread.
 	 */
 	switch (wgm.wgm_type) {
 	case WG_MSG_TYPE_DATA:
 		m_adj(m, offset);
 		wg_handle_msg_data(wg, m, src);
 		*mp = NULL;
 		return 1;
 	default:
 		break;
+	}
 	return 0;
+}

 @@ -1,14 +1,14 @@
-#	$NetBSD: t_misc.sh,v 1.2 2020/08/27 02:51:49 riastradh Exp $
+#	$NetBSD: t_misc.sh,v 1.3 2020/08/27 02:52:33 riastradh Exp $
+#
 # Copyright (c) 2018 Ryota Ozaki <ozaki.ryota@gmail.com>
 # All rights reserved.
+#
 # 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.
+#
 @@ -578,23 +578,96 @@ wg_psk_body()
 	rm -f $pskfile
 	destroy_wg_interfaces
+}
 wg_psk_cleanup()
+{
 	$DEBUG && dump
 	cleanup
+}
 atf_test_case wg_malformed cleanup
 wg_malformed_head()
+{
 	atf_set "descr" "tests malformed packet headers"
 	atf_set "require.progs" "nc" "rump_server" "wgconfig" "wg-keygen"
 	atf_set "timeout" "10"
+}
 wg_malformed_body()
+{
 	local ifconfig="atf_check -s exit:0 rump.ifconfig"
 	local ping="atf_check -s exit:0 -o ignore rump.ping -n -c 1 -w 1"
 	local ip_local=192.168.1.1
 	local ip_peer=192.168.1.2
 	local ip_wg_local=10.0.0.1
 	local ip_wg_peer=10.0.0.2
 	local port=51820
 	setup_servers
 	# It sets key_priv_local key_pub_local key_priv_peer key_pub_peer
 	generate_keys
 	export RUMP_SERVER=$SOCK_LOCAL
 	setup_common shmif0 inet $ip_local 24
 	setup_wg_common wg0 inet $ip_wg_local 24 $port "$key_priv_local"
 	export RUMP_SERVER=$SOCK_PEER
 	setup_common shmif0 inet $ip_peer 24
 	setup_wg_common wg0 inet $ip_wg_peer 24 $port "$key_priv_peer"
 	export RUMP_SERVER=$SOCK_LOCAL
 	add_peer wg0 peer0 $key_pub_peer $ip_peer:$port $ip_wg_peer/32
 	export RUMP_SERVER=$SOCK_PEER
 	add_peer wg0 peer0 $key_pub_local $ip_local:$port $ip_wg_local/32
 	export RUMP_SERVER=$SOCK_LOCAL
 	$ping $ip_wg_peer
 	printf 'send malformed packets\n'
 	$HIJACKING ping -c 1 -n $ip_peer
 	printf 'x' | $HIJACKING nc -Nu -w 0 $ip_peer $port
 	printf 'xy' | $HIJACKING nc -Nu -w 0 $ip_peer $port
 	printf 'xyz' | $HIJACKING nc -Nu -w 0 $ip_peer $port
 	printf 'xyzw' | $HIJACKING nc -Nu -w 0 $ip_peer $port
 	printf '\x00\x00\x00\x00' | $HIJACKING nc -Nu -w 0 $ip_peer $port
 	printf '\x00\x00\x00\x00z' | $HIJACKING nc -Nu -w 0 $ip_peer $port
 	printf '\x01\x00\x00\x00' | $HIJACKING nc -Nu -w 0 $ip_peer $port
 	printf '\x01\x00\x00\x00z' | $HIJACKING nc -Nu -w 0 $ip_peer $port
 	printf '\x02\x00\x00\x00' | $HIJACKING nc -Nu -w 0 $ip_peer $port
 	printf '\x02\x00\x00\x00z' | $HIJACKING nc -Nu -w 0 $ip_peer $port
 	printf '\x03\x00\x00\x00' | $HIJACKING nc -Nu -w 0 $ip_peer $port
 	printf '\x03\x00\x00\x00z' | $HIJACKING nc -Nu -w 0 $ip_peer $port
 	printf '\x04\x00\x00\x00' | $HIJACKING nc -Nu -w 0 $ip_peer $port
 	printf '\x04\x00\x00\x00z' | $HIJACKING nc -Nu -w 0 $ip_peer $port
 	printf 'done sending malformed packets\n'
 	$ping $ip_wg_peer
+}
 wg_malformed_cleanup()
+{
 	$DEBUG && dump
 	cleanup
+}
 atf_init_test_cases()
+{
 	atf_add_test_case wg_rekey
 	atf_add_test_case wg_handshake_timeout
 	atf_add_test_case wg_cookie
 	atf_add_test_case wg_mobility
 	atf_add_test_case wg_keepalive
 	atf_add_test_case wg_psk
 	atf_add_test_case wg_malformed
+}