Module Name: src
Committed By: martin
Date: Sat Feb 21 18:24:51 UTC 2015
Modified Files:
src/sys/netinet [netbsd-7]: icmp_var.h ip_icmp.h
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.29.22.1 src/sys/netinet/icmp_var.h
cvs rdiff -u -r1.33 -r1.33.22.1 src/sys/netinet/ip_icmp.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/icmp_var.h
diff -u src/sys/netinet/icmp_var.h:1.29 src/sys/netinet/icmp_var.h:1.29.22.1
--- src/sys/netinet/icmp_var.h:1.29 Sat Dec 24 19:54:41 2011
+++ src/sys/netinet/icmp_var.h Sat Feb 21 18:24:51 2015
@@ -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
Index: src/sys/netinet/ip_icmp.h
diff -u src/sys/netinet/ip_icmp.h:1.33 src/sys/netinet/ip_icmp.h:1.33.22.1
--- src/sys/netinet/ip_icmp.h:1.33 Sat Dec 24 20:18:54 2011
+++ src/sys/netinet/ip_icmp.h Sat Feb 21 18:24:51 2015
@@ -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 @@ struct icmp {
#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[] = {
