[src/netbsd-8]: src/sys/netinet6 Pull up following revision(s) (requested by ...

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

details:   https://anonhg.NetBSD.org/src/rev/7138dc46e14b
branches:  netbsd-8
changeset: 851400:7138dc46e14b
user:      snj <snj%NetBSD.org@localhost>
date:      Mon Feb 26 00:26:46 2018 +0000

description:
Pull up following revision(s) (requested by maxv in ticket #568):
        sys/netinet6/ip6_input.c: 1.188
Kick nested fragments.

diffstat:

 sys/netinet6/ip6_input.c |  13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diffs (48 lines):

diff -r 18b9db824309 -r 7138dc46e14b sys/netinet6/ip6_input.c
--- a/sys/netinet6/ip6_input.c  Mon Feb 26 00:25:16 2018 +0000
+++ b/sys/netinet6/ip6_input.c  Mon Feb 26 00:26:46 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip6_input.c,v 1.178.2.4 2018/01/30 18:21:09 martin Exp $       */
+/*     $NetBSD: ip6_input.c,v 1.178.2.5 2018/02/26 00:26:46 snj Exp $  */
 /*     $KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $     */
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.178.2.4 2018/01/30 18:21:09 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.178.2.5 2018/02/26 00:26:46 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_gateway.h"
@@ -258,7 +258,7 @@
        int hit, off = sizeof(struct ip6_hdr), nest;
        u_int32_t plen;
        u_int32_t rtalert = ~0;
-       int nxt, ours = 0, rh_present = 0;
+       int nxt, ours = 0, rh_present = 0, frg_present;
        struct ifnet *deliverifp = NULL;
        int srcrt = 0;
        struct rtentry *rt = NULL;
@@ -776,6 +776,7 @@
        percpu_putref(ip6_forward_rt_percpu);
 
        rh_present = 0;
+       frg_present = 0;
        while (nxt != IPPROTO_DONE) {
                if (ip6_hdrnestlimit && (++nest > ip6_hdrnestlimit)) {
                        IP6_STATINC(IP6_STAT_TOOMANYHDR);
@@ -799,6 +800,12 @@
                                IP6_STATINC(IP6_STAT_BADOPTIONS);
                                goto bad;
                        }
+               } else if (nxt == IPPROTO_FRAGMENT) {
+                       if (frg_present++) {
+                               in6_ifstat_inc(rcvif, ifs6_in_hdrerr);
+                               IP6_STATINC(IP6_STAT_BADOPTIONS);
+                               goto bad;
+                       }
                }
 
 #ifdef IPSEC