Module Name: src
Committed By: martin
Date: Fri Feb 16 18:12:47 UTC 2018
Modified Files:
src/sys/netipsec [netbsd-6-0]: ipsec.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #1531):
sys/netipsec/ipsec.c: revision 1.130
Fix inverted logic, otherwise the kernel crashes when receiving a 1-byte
AH packet. Triggerable before authentication when IPsec and forwarding
are both enabled.
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.55.12.1 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.55 src/sys/netipsec/ipsec.c:1.55.12.1
--- src/sys/netipsec/ipsec.c:1.55 Thu Jun 9 19:54:18 2011
+++ src/sys/netipsec/ipsec.c Fri Feb 16 18:12:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec.c,v 1.55 2011/06/09 19:54:18 drochner Exp $ */
+/* $NetBSD: ipsec.c,v 1.55.12.1 2018/02/16 18:12:47 martin Exp $ */
/* $FreeBSD: /usr/local/www/cvsroot/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.55 2011/06/09 19:54:18 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.55.12.1 2018/02/16 18:12:47 martin Exp $");
/*
* IPsec controller part.
@@ -979,7 +979,7 @@ ipsec4_get_ulp(struct mbuf *m, struct se
spidx->dst.sin.sin_port = uh.uh_dport;
return;
case IPPROTO_AH:
- if (m->m_pkthdr.len > off + sizeof(ip6e))
+ if (off + sizeof(ip6e) > m->m_pkthdr.len)
goto done;
/* XXX sigh, this works but is totally bogus */
m_copydata(m, off, sizeof(ip6e), &ip6e);
