 @@ -1,14 +1,14 @@
-/*	$NetBSD: ip_encap.c,v 1.40 2015/04/15 03:32:23 ozaki-r Exp $	*/
+/*	$NetBSD: ip_encap.c,v 1.41 2015/04/15 03:38:50 ozaki-r Exp $	*/
 /*	$KAME: ip_encap.c,v 1.73 2001/10/02 08:30:58 itojun 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
 @@ -65,27 +65,27 @@
  * The code assumes that radix table code can handle non-continuous netmask,
  * as it will pass radix table memory region with (src + dst) sockaddr pair.
+ *
  * FreeBSD is excluded here as they make max_keylen a static variable, and
  * thus forbid definition of radix table other than proper domains.
+ *
  * !!!!!!!
  * !!NOTE: dom_maxrtkey assumes USE_RADIX is defined.
  * !!!!!!!
  */
 #define USE_RADIX
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_encap.c,v 1.40 2015/04/15 03:32:23 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_encap.c,v 1.41 2015/04/15 03:38:50 ozaki-r Exp $");
 #include "opt_mrouting.h"
 #include "opt_inet.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/errno.h>
 #include <sys/protosw.h>
 #include <sys/queue.h>
 @@ -175,30 +175,28 @@ encap_init(void)
 #ifdef INET
 static struct encaptab *
 encap4_lookup(struct mbuf *m, int off, int proto, enum direction dir)
+{
 	struct ip *ip;
 	struct ip_pack4 pack;
 	struct encaptab *ep, *match;
 	int prio, matchprio;
 #ifdef USE_RADIX
 	struct radix_node_head *rnh = encap_rnh(AF_INET);
 	struct radix_node *rn;
 #endif
-#ifdef DIAGNOSTIC
+	KASSERT(m->m_len >= sizeof(*ip));
 	if (m->m_len < sizeof(*ip))
 		panic("encap4_lookup");
 #endif
 	ip = mtod(m, struct ip *);
 	memset(&pack, 0, sizeof(pack));
 	pack.p.sp_len = sizeof(pack);
 	pack.mine.sin_family = pack.yours.sin_family = AF_INET;
 	pack.mine.sin_len = pack.yours.sin_len = sizeof(struct sockaddr_in);
 	if (dir == INBOUND) {
 		pack.mine.sin_addr = ip->ip_dst;
 		pack.yours.sin_addr = ip->ip_src;
 	} else {
 		pack.mine.sin_addr = ip->ip_src;
 		pack.yours.sin_addr = ip->ip_dst;
+	}
 @@ -299,30 +297,28 @@ encap4_input(struct mbuf *m, ...)
 #ifdef INET6
 static struct encaptab *
 encap6_lookup(struct mbuf *m, int off, int proto, enum direction dir)
+{
 	struct ip6_hdr *ip6;
 	struct ip_pack6 pack;
 	int prio, matchprio;
 	struct encaptab *ep, *match;
 #ifdef USE_RADIX
 	struct radix_node_head *rnh = encap_rnh(AF_INET6);
 	struct radix_node *rn;
 #endif
-#ifdef DIAGNOSTIC
+	KASSERT(m->m_len >= sizeof(*ip6));
 	if (m->m_len < sizeof(*ip6))
 		panic("encap6_lookup");
 #endif
 	ip6 = mtod(m, struct ip6_hdr *);
 	memset(&pack, 0, sizeof(pack));
 	pack.p.sp_len = sizeof(pack);
 	pack.mine.sin6_family = pack.yours.sin6_family = AF_INET6;
 	pack.mine.sin6_len = pack.yours.sin6_len = sizeof(struct sockaddr_in6);
 	if (dir == INBOUND) {
 		pack.mine.sin6_addr = ip6->ip6_dst;
 		pack.yours.sin6_addr = ip6->ip6_src;
 	} else {
 		pack.mine.sin6_addr = ip6->ip6_src;
 		pack.yours.sin6_addr = ip6->ip6_dst;
+	}
 @@ -498,30 +494,30 @@ encap_attach(int af, int proto,
 	/* sanity check on args */
 	error = encap_afcheck(af, sp, dp);
 	if (error)
 		goto fail;
 	/* check if anyone have already attached with exactly same config */
 	LIST_FOREACH(ep, &encaptab, chain) {
 		if (ep->af != af)
 			continue;
 		if (ep->proto != proto)
 			continue;
 		if (ep->func)
 			continue;
 #ifdef DIAGNOSTIC
-		if (!ep->src || !ep->dst || !ep->srcmask || !ep->dstmask)
+		KASSERT(ep->src != NULL && ep->dst != NULL &&
-			panic("null pointers in encaptab");
+		    ep->srcmask != NULL && ep->dstmask != NULL);
 #endif
 		if (ep->src->sa_len != sp->sa_len ||
 		    memcmp(ep->src, sp, sp->sa_len) != 0 ||
 		    memcmp(ep->srcmask, sm, sp->sa_len) != 0)
 			continue;
 		if (ep->dst->sa_len != dp->sa_len ||
 		    memcmp(ep->dst, dp, dp->sa_len) != 0 ||
 		    memcmp(ep->dstmask, dm, dp->sa_len) != 0)
 			continue;
 		error = EEXIST;
 		goto fail;
+	}
 @@ -798,30 +794,28 @@ mask_matchlen(const struct sockaddr *sa)
 #ifndef USE_RADIX
 static int
 mask_match(const struct encaptab *ep,
 	   const struct sockaddr *sp,
 	   const struct sockaddr *dp)
+{
 	struct sockaddr_storage s;
 	struct sockaddr_storage d;
 	int i;
 	const u_int8_t *p, *q;
 	u_int8_t *r;
 	int matchlen;
-#ifdef DIAGNOSTIC
+	KASSERTMSG(ep->func == NULL, "wrong encaptab passed to mask_match");
 	if (ep->func)
 		panic("wrong encaptab passed to mask_match");
 #endif
 	if (sp->sa_len > sizeof(s) || dp->sa_len > sizeof(d))
 		return 0;
 	if (sp->sa_family != ep->af || dp->sa_family != ep->af)
 		return 0;
 	if (sp->sa_len != ep->src->sa_len || dp->sa_len != ep->dst->sa_len)
 		return 0;
 	matchlen = 0;
 	p = (const u_int8_t *)sp;
 	q = (const u_int8_t *)ep->srcmask;
 	r = (u_int8_t *)&s;
 	for (i = 0 ; i < sp->sa_len; i++) {