Sat Jun 10 14:21:01 2017 UTC ()

Do m_pullup before mtod

It may fix panicks of some tests on anita/sparc and anita/GuruPlug.


(ozaki-r)

diff -r1.163 -r1.164 src/sys/netipsec/key.c

--- src/sys/netipsec/key.c 2017/06/02 03:32:51	1.163
+++ src/sys/netipsec/key.c 2017/06/10 14:21:01	1.164

 @@ -1,14 +1,14 @@
-/*	$NetBSD: key.c,v 1.163 2017/06/02 03:32:51 ozaki-r Exp $	*/
+/*	$NetBSD: key.c,v 1.164 2017/06/10 14:21:01 ozaki-r Exp $	*/
 /*	$FreeBSD: src/sys/netipsec/key.c,v 1.3.2.3 2004/02/14 22:23:23 bms Exp $	*/
 /*	$KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane 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
 @@ -22,27 +22,27 @@
  * 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 PROJECT 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.163 2017/06/02 03:32:51 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.164 2017/06/10 14:21:01 ozaki-r Exp $");
 /*
  * This code is referd to RFC 2367
  */
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
 #include "opt_ipsec.h"
 #include "opt_gateway.h"
 #endif
 #include <sys/types.h>
 #include <sys/param.h>
 @@ -6006,26 +6006,32 @@ key_getcomb_ah(void)
 			KASSERTMSG(l <= MLEN,
 			    "l=%u > MLEN=%lu", l, (u_long) MLEN);
 			MGET(m, M_DONTWAIT, MT_DATA);
 			if (m) {
 				M_ALIGN(m, l);
 				m->m_len = l;
 				m->m_next = NULL;
+			}
 		} else
 			M_PREPEND(m, l, M_DONTWAIT);
 		if (!m)
 			return NULL;
 		if (m->m_len < sizeof(struct sadb_comb)) {
 			m = m_pullup(m, sizeof(struct sadb_comb));
 			if (m == NULL)
 				return NULL;
+		}
 		comb = mtod(m, struct sadb_comb *);
 		memset(comb, 0, sizeof(*comb));
 		key_getcomb_setlifetime(comb);
 		comb->sadb_comb_auth = i;
 		comb->sadb_comb_auth_minbits = _BITS(minkeysize);
 		comb->sadb_comb_auth_maxbits = _BITS(maxkeysize);
+	}
 	return m;
+}
 /*
  * not really an official behavior.  discussed in pf_key@inner.net in Sep2000.
 @@ -6050,26 +6056,32 @@ key_getcomb_ipcomp(void)
 			KASSERTMSG(l <= MLEN,
 			    "l=%u > MLEN=%lu", l, (u_long) MLEN);
 			MGET(m, M_DONTWAIT, MT_DATA);
 			if (m) {
 				M_ALIGN(m, l);
 				m->m_len = l;
 				m->m_next = NULL;
+			}
 		} else
 			M_PREPEND(m, l, M_DONTWAIT);
 		if (!m)
 			return NULL;
 		if (m->m_len < sizeof(struct sadb_comb)) {
 			m = m_pullup(m, sizeof(struct sadb_comb));
 			if (m == NULL)
 				return NULL;
+		}
 		comb = mtod(m, struct sadb_comb *);
 		memset(comb, 0, sizeof(*comb));
 		key_getcomb_setlifetime(comb);
 		comb->sadb_comb_encrypt = i;
 		/* what should we set into sadb_comb_*_{min,max}bits? */
+	}
 	return m;
+}
 /*
  * XXX no way to pass mode (transport/tunnel) to userland
  * XXX replay checking?