CVS commit: src/sys/netipsec

[Ryota Ozaki]

Module Name:    src
Committed By:   ozaki-r
Date:           Sat Jun 10 14:21:01 UTC 2017

Modified Files:
        src/sys/netipsec: key.c

Log Message:
Do m_pullup before mtod

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


To generate a diff of this commit:
cvs rdiff -u -r1.163 -r1.164 src/sys/netipsec/key.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/netipsec/key.c
diff -u src/sys/netipsec/key.c:1.163 src/sys/netipsec/key.c:1.164
--- src/sys/netipsec/key.c:1.163	Fri Jun  2 03:32:51 2017
+++ src/sys/netipsec/key.c	Sat Jun 10 14:21:01 2017
@@ -1,4 +1,4 @@
-/*	$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 $	*/
 
@@ -32,7 +32,7 @@
  */
 
 #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
@@ -6016,6 +6016,12 @@ key_getcomb_ah(void)
 		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);
@@ -6060,6 +6066,12 @@ key_getcomb_ipcomp(void)
 		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);