 @@ -1,14 +1,14 @@
-/*	$NetBSD: udp_usrreq.c,v 1.217 2014/08/09 05:33:01 rtr Exp $	*/
+/*	$NetBSD: udp_usrreq.c,v 1.217.6.1 2018/06/07 05:03:26 martin Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * 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.
 @@ -56,27 +56,27 @@
  * 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.
+ *
  *	@(#)udp_usrreq.c	8.6 (Berkeley) 5/23/95
  */
 /*
  * UDP protocol implementation.
  * Per RFC 768, August, 1980.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.217 2014/08/09 05:33:01 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.217.6.1 2018/06/07 05:03:26 martin Exp $");
 #include "opt_inet.h"
 #include "opt_compat_netbsd.h"
 #include "opt_ipsec.h"
 #include "opt_inet_csum.h"
 #include "opt_ipkdb.h"
 #include "opt_mbuftrace.h"
 #include <sys/param.h>
 #include <sys/mbuf.h>
 #include <sys/once.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 @@ -385,27 +385,35 @@ udp_input(struct mbuf *m, ...)
 	sockaddr_in_init(&dst, &ip->ip_dst, uh->uh_dport);
 	if ((n = udp4_realinput(&src, &dst, &m, iphlen)) == -1) {
 		UDP_STATINC(UDP_STAT_HDROPS);
 		return;
+	}
 	if (m == NULL) {
 		/*
 		 * packet has been processed by ESP stuff -
 		 * e.g. dropped NAT-T-keep-alive-packet ...
 		 */
 		return;
+	}
 	ip = mtod(m, struct ip *);
 	IP6_EXTHDR_GET(uh, struct udphdr *, m, iphlen, sizeof(struct udphdr));
 	if (uh == NULL) {
 		UDP_STATINC(UDP_STAT_HDROPS);
 		return;
+	}
 	/* XXX Re-enforce alignment? */
 #ifdef INET6
 	if (IN_MULTICAST(ip->ip_dst.s_addr) || n == 0) {
 		struct sockaddr_in6 src6, dst6;
 		memset(&src6, 0, sizeof(src6));
 		src6.sin6_family = AF_INET6;
 		src6.sin6_len = sizeof(struct sockaddr_in6);
 		src6.sin6_addr.s6_addr[10] = src6.sin6_addr.s6_addr[11] = 0xff;
 		memcpy(&src6.sin6_addr.s6_addr[12], &ip->ip_src,
 			sizeof(ip->ip_src));
 		src6.sin6_port = uh->uh_sport;
 		memset(&dst6, 0, sizeof(dst6));
 		dst6.sin6_family = AF_INET6;
 @@ -1291,27 +1299,27 @@ udp4_espinudp(struct mbuf **mp, int off,
 		if ((*mp = m_pullup(m, minlen)) == NULL) {
 			printf("udp4_espinudp: m_pullup failed\n");
 			return -1;
+		}
 		m = *mp;
+	}
 	len = m->m_len - off;
 	data = mtod(m, char *) + off;
 	inp = sotoinpcb(so);
 	/* Ignore keepalive packets */
 	if ((len == 1) && (*(unsigned char *)data == 0xff)) {
-		m_free(m);
+		m_freem(m);
 		*mp = NULL; /* avoid any further processiong by caller ... */
 		return 1;
+	}
 	/*
 	 * Check that the payload is long enough to hold
 	 * an ESP header and compute the length of encapsulation
 	 * header to remove
 	 */
 	if (inp->inp_flags & INP_ESPINUDP) {
 		u_int32_t *st = (u_int32_t *)data;
 		if ((len <= sizeof(struct esp)) || (*st == 0))
 @@ -1373,27 +1381,28 @@ udp4_espinudp(struct mbuf **mp, int off,
 	if ((tag = m_tag_get(PACKET_TAG_IPSEC_NAT_T_PORTS,
 	    sizeof(sport) + sizeof(dport), M_DONTWAIT)) == NULL) {
 		printf("udp4_espinudp: m_tag_get failed\n");
 		m_freem(m);
 		return -1;
+	}
 	((u_int16_t *)(tag + 1))[0] = sport;
 	((u_int16_t *)(tag + 1))[1] = dport;
 	m_tag_prepend(m, tag);
 #ifdef IPSEC
 	if (ipsec_used)
 		ipsec4_common_input(m, iphdrlen, IPPROTO_ESP);
-	/* XXX: else */
+	else
 		m_freem(m);
 #else
 	esp4_input(m, iphdrlen);
 #endif
 	/* We handled it, it shouldn't be handled by UDP */
 	*mp = NULL; /* avoid free by caller ... */
 	return 1;
+}
 #endif
 PR_WRAP_USRREQS(udp)
 #define	udp_attach	udp_attach_wrapper
 #define	udp_detach	udp_detach_wrapper