Module Name: src
Committed By: maxv
Date: Wed Feb 21 16:42:34 UTC 2018
Modified Files:
src/sys/netipsec: ipsec.c
Log Message:
Fix ipsec4_get_ulp(). We should do "goto done" instead of "return",
otherwise the port fields of spidx are uninitialized.
ok mlelstv@
To generate a diff of this commit:
cvs rdiff -u -r1.133 -r1.134 src/sys/netipsec/ipsec.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/ipsec.c
diff -u src/sys/netipsec/ipsec.c:1.133 src/sys/netipsec/ipsec.c:1.134
--- src/sys/netipsec/ipsec.c:1.133 Wed Feb 21 16:38:15 2018
+++ src/sys/netipsec/ipsec.c Wed Feb 21 16:42:33 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec.c,v 1.133 2018/02/21 16:38:15 maxv Exp $ */
+/* $NetBSD: ipsec.c,v 1.134 2018/02/21 16:42:33 maxv Exp $ */
/* $FreeBSD: src/sys/netipsec/ipsec.c,v 1.2.2.2 2003/07/01 01:38:13 sam Exp $ */
/* $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $ */
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.133 2018/02/21 16:38:15 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.134 2018/02/21 16:42:33 maxv Exp $");
/*
* IPsec controller part.
@@ -1049,7 +1049,7 @@ ipsec4_get_ulp(struct mbuf *m, struct se
case IPPROTO_ICMP:
spidx->ul_proto = nxt;
if (off + sizeof(struct icmp) > m->m_pkthdr.len)
- return;
+ goto done;
m_copydata(m, off, sizeof(icmph), &icmph);
((struct sockaddr_in *)&spidx->src)->sin_port =
htons((uint16_t)icmph.icmp_type);
