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

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

details:   https://anonhg.NetBSD.org/src/rev/fd4949764f07
branches:  netbsd-6-0
changeset: 775314:fd4949764f07
user:      snj <snj%NetBSD.org@localhost>
date:      Tue Mar 13 17:47:11 2018 +0000

description:
Pull up following revision(s) (requested by maxv in ticket #1536):
        sys/netipsec/ipsec_input.c: 1.57-1.58
Extend these #ifdef notyet. The m_copydata's in these branches are wrong,
we are not guaranteed to have enough room for another struct ip, and we
may crash here. Triggerable remotely, but after authentication, by sending
an AH packet that has a one-byte-sized IPIP payload.
--
Argh, in my previous commit in this file I forgot to fix the IPv6
entry point; apply the same fix there.

diffstat:

 sys/netipsec/ipsec_input.c |  21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 deletions(-)

diffs (113 lines):

diff -r 68c2f511f4f1 -r fd4949764f07 sys/netipsec/ipsec_input.c
--- a/sys/netipsec/ipsec_input.c        Tue Mar 13 17:42:37 2018 +0000
+++ b/sys/netipsec/ipsec_input.c        Tue Mar 13 17:47:11 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ipsec_input.c,v 1.29 2012/01/25 21:58:10 drochner Exp $        */
+/*     $NetBSD: ipsec_input.c,v 1.29.8.1 2018/03/13 17:47:11 snj Exp $ */
 /*     $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/ipsec_input.c,v 1.2.4.2 2003/03/28 20:32:53 sam Exp $ */
 /*     $OpenBSD: ipsec_input.c,v 1.63 2003/02/20 18:35:43 deraadt Exp $        */
 
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipsec_input.c,v 1.29 2012/01/25 21:58:10 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec_input.c,v 1.29.8.1 2018/03/13 17:47:11 snj Exp $");
 
 /*
  * IPsec input processing.
@@ -332,14 +332,15 @@
        ip->ip_len = htons(m->m_pkthdr.len);
        prot = ip->ip_p;
 
+#ifdef notyet
        /* IP-in-IP encapsulation */
        if (prot == IPPROTO_IPIP) {
                struct ip ipn;
 
                /* ipn will now contain the inner IPv4 header */
+               /* XXX: check m_pkthdr.len */
                m_copydata(m, ip->ip_hl << 2, sizeof(struct ip), &ipn);
 
-#ifdef notyet
                /* XXX PROXY address isn't recorded in SAH */
                /*
                 * Check that the inner source address is the same as
@@ -367,7 +368,6 @@
                        error = EACCES;
                        goto bad;
                }
-#endif /*XXX*/
        }
 #if INET6
        /* IPv6-in-IP encapsulation. */
@@ -375,9 +375,9 @@
                struct ip6_hdr ip6n;
 
                /* ip6n will now contain the inner IPv6 header. */
+               /* XXX: check m_pkthdr.len */
                m_copydata(m, ip->ip_hl << 2, sizeof(struct ip6_hdr), &ip6n);
 
-#ifdef notyet
                /*
                 * Check that the inner source address is the same as
                 * the proxy address, if available.
@@ -403,9 +403,9 @@
                        error = EACCES;
                        goto bad;
                }
-#endif /*XXX*/
        }
 #endif /* INET6 */
+#endif /* notyet */
 
        /*
         * Record what we've done to the packet (under what SA it was
@@ -651,15 +651,16 @@
        /* Save protocol */
        m_copydata(m, protoff, 1, &prot);
 
+#ifdef notyet
 #ifdef INET
        /* IP-in-IP encapsulation */
        if (prot == IPPROTO_IPIP) {
                struct ip ipn;
 
                /* ipn will now contain the inner IPv4 header */
+               /* XXX: check m_pkthdr.len */
                m_copydata(m, skip, sizeof(struct ip), &ipn);
 
-#ifdef notyet
                /*
                 * Check that the inner source address is the same as
                 * the proxy address, if available.
@@ -683,18 +684,16 @@
                        error = EACCES;
                        goto bad;
                }
-#endif /*XXX*/
        }
 #endif /* INET */
-
        /* IPv6-in-IP encapsulation */
        if (prot == IPPROTO_IPV6) {
                struct ip6_hdr ip6n;
 
                /* ip6n will now contain the inner IPv6 header. */
+               /* XXX: check m_pkthdr.len */
                m_copydata(m, skip, sizeof(struct ip6_hdr), &ip6n);
 
-#ifdef notyet
                /*
                 * Check that the inner source address is the same as
                 * the proxy address, if available.
@@ -719,8 +718,8 @@
                        error = EACCES;
                        goto bad;
                }
-#endif /*XXX*/
        }
+#endif /* notyet */
 
        /*
         * Record what we've done to the packet (under what SA it was