[src/netbsd-7-1]: src/sys/netipsec Pull up following revision(s) (requested b...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6df103f088e6
branches:  netbsd-7-1
changeset: 800859:6df103f088e6
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Feb 16 16:40:39 2018 +0000

description:
Pull up following revision(s) (requested by maxv in ticket #1570):

        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.

diffstat:

 sys/netipsec/ipsec.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r bfb0b62d3f70 -r 6df103f088e6 sys/netipsec/ipsec.c
--- a/sys/netipsec/ipsec.c      Thu Feb 15 17:52:22 2018 +0000
+++ b/sys/netipsec/ipsec.c      Fri Feb 16 16:40:39 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ipsec.c,v 1.63 2014/05/30 01:39:03 christos Exp $      */
+/*     $NetBSD: ipsec.c,v 1.63.8.1 2018/02/16 16:40:39 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.63 2014/05/30 01:39:03 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.63.8.1 2018/02/16 16:40:39 martin Exp $");
 
 /*
  * IPsec controller part.
@@ -1176,7 +1176,7 @@
                        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);