[src/netbsd-7]: src/sys/netinet Pull up following revision(s) (requested by c...

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

details:   https://anonhg.NetBSD.org/src/rev/8925ac8e5abb
branches:  netbsd-7
changeset: 799014:8925ac8e5abb
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Feb 21 18:24:51 2015 +0000

description:
Pull up following revision(s) (requested by christos in ticket #537):
        sys/netinet/icmp_var.h: revision 1.30
        sys/netinet/ip_icmp.h: revision 1.34
PR/49676: Ryo Shimizu: ICMP_STATINC() buffer overflows
XXX: pullup-7

diffstat:

 sys/netinet/icmp_var.h |  6 +++---
 sys/netinet/ip_icmp.h  |  3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diffs (37 lines):

diff -r a3c280441f29 -r 8925ac8e5abb sys/netinet/icmp_var.h
--- a/sys/netinet/icmp_var.h    Sat Feb 21 18:22:01 2015 +0000
+++ b/sys/netinet/icmp_var.h    Sat Feb 21 18:24:51 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: icmp_var.h,v 1.29 2011/12/24 19:54:41 christos Exp $   */
+/*     $NetBSD: icmp_var.h,v 1.29.22.1 2015/02/21 18:24:51 martin Exp $        */
 
 /*
  * Copyright (c) 1982, 1986, 1993
@@ -56,8 +56,8 @@
 #define        ICMP_STAT_BMCASTTSTAMP  10      /* b/mcast tstamp requests dropped */
 #define        ICMP_STAT_LAST          16      /* Allow for 5 spare ones */
 #define        ICMP_STAT_OUTHIST       ICMP_STAT_LAST
-#define        ICMP_STAT_INHIST        (ICMP_STAT_LAST + ICMP_MAXTYPE)
-#define        ICMP_NSTATS             (ICMP_STAT_LAST + 2 * ICMP_MAXTYPE)
+#define        ICMP_STAT_INHIST        (ICMP_STAT_LAST + ICMP_NTYPES)
+#define        ICMP_NSTATS             (ICMP_STAT_LAST + 2 * ICMP_NTYPES)
 
 /*
  * Names for ICMP sysctl objects
diff -r a3c280441f29 -r 8925ac8e5abb sys/netinet/ip_icmp.h
--- a/sys/netinet/ip_icmp.h     Sat Feb 21 18:22:01 2015 +0000
+++ b/sys/netinet/ip_icmp.h     Sat Feb 21 18:24:51 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_icmp.h,v 1.33 2011/12/24 20:18:54 christos Exp $    */
+/*     $NetBSD: ip_icmp.h,v 1.33.22.1 2015/02/21 18:24:51 martin Exp $ */
 
 /*
  * Copyright (c) 1982, 1986, 1993
@@ -189,6 +189,7 @@
 #define                ICMP_PHOTURIS_NEED_AUTHZ        5       /* no authorization */
 
 #define ICMP_MAXTYPE           40
+#define ICMP_NTYPES            (ICMP_MAXTYPE + 1)
 
 #ifdef ICMP_STRINGS
 static const char *icmp_type[] = {