From b8dbd9ded2ed808a696a6fe4445fed61a7831dc8 Mon Sep 17 00:00:00 2001
From: gordon <gordon@FreeBSD.org>
Date: Thu, 27 Sep 2018 18:29:55 +0000
Subject: [PATCH] Fix regression in IPv6 fragment reassembly. [EN-18:09.ip]

Approved by:	so
Security:	FreeBSD-EN-18:09.ip
---
 UPDATING             | 13 +++++++++++++
 sys/conf/newvers.sh  |  2 +-
 sys/netinet6/frag6.c |  4 +++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/UPDATING b/UPDATING
index 1fcb5f11d57..666daac01d1 100644
--- a/UPDATING
+++ b/UPDATING
@@ -16,6 +16,19 @@ from older versions of FreeBSD, try WITHOUT_CLANG and WITH_GCC to bootstrap to
 the tip of head, and then rebuild without this option. The bootstrap process
 from older version of current across the gcc/clang cutover is a bit fragile.
 
+20180927	p4	FreeBSD-EN-18:09.ip
+			FreeBSD-EN-18:10.syscall
+			FreeBSD-EN-18:11.listen
+			FreeBSD-EN-18:12.mem
+
+	Fix regression in IPv6 fragment reassembly. [EN-18:09.ip]
+
+	Fix NULL pointer dereference in freebsd4_getfsstat. [EN-18:10.syscall]
+
+	Fix DoS in listen syscall over IPv6 socket. [EN-18:11.listen]
+
+	Fix small kernel memory disclosures. [EN-18:12.mem]
+
 20180912	p3	FreeBSD-SA-18:12.elf
 			FreeBSD-EN-18:08.lazyfpu
 
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index d2053e4725b..bd3610fa02d 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -44,7 +44,7 @@
 
 TYPE="FreeBSD"
 REVISION="11.2"
-BRANCH="RELEASE-p3"
+BRANCH="RELEASE-p4"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi
diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c
index a438ea4beed..9bb74e0807d 100644
--- a/sys/netinet6/frag6.c
+++ b/sys/netinet6/frag6.c
@@ -216,7 +216,9 @@ frag6_input(struct mbuf **mp, int *offp, int proto)
 	int offset = *offp, nxt, i, next;
 	int first_frag = 0;
 	int fragoff, frgpartlen;	/* must be larger than u_int16_t */
-	uint32_t hash, hashkey[sizeof(struct in6_addr) * 2 + 1], *hashkeyp;
+	uint32_t hashkey[(sizeof(struct in6_addr) * 2 +
+		    sizeof(ip6f->ip6f_ident)) / sizeof(uint32_t)];
+	uint32_t hash, *hashkeyp;
 	struct ifnet *dstifp;
 	u_int8_t ecn, ecn0;
 #ifdef RSS
-- 
2.45.0