svn commit: r330631 - in releng: 10.3 10.3/sys/conf 10.4 10.4/sys/conf

[Gordon Tetlow]

Author: gordon
Date: Thu Mar  8 06:17:07 2018
New Revision: 330631
URL: https://svnweb.freebsd.org/changeset/base/330631

Log:
  Bump newvers and document the updated patch for SA-18:01.ipsec
  
  Approved by:	so
  Security:	FreeBSD-SA-18:01.ipsec
  Security:	CVE-2018-6916

Modified:
  releng/10.3/UPDATING
  releng/10.3/sys/conf/newvers.sh
  releng/10.4/UPDATING
  releng/10.4/sys/conf/newvers.sh

Modified: releng/10.3/UPDATING
==============================================================================
--- releng/10.3/UPDATING	Thu Mar  8 05:41:53 2018	(r330630)
+++ releng/10.3/UPDATING	Thu Mar  8 06:17:07 2018	(r330631)
@@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITHOUT_CLANG to b
 stable/10, and then rebuild without this option. The bootstrap process from
 older version of current is a bit fragile.
 
+20180308	p28	FreeBSD-SA-18:01.ipsec [revised]
+
+	Fix ipsec validation and use-after-free.
+
 20180307	p27	FreeBSD-SA-18:01.ipsec
 			FreeBSD-SA-18:02.ntp
 			FreeBSD-EN-18:01.tzdata

Modified: releng/10.3/sys/conf/newvers.sh
==============================================================================
--- releng/10.3/sys/conf/newvers.sh	Thu Mar  8 05:41:53 2018	(r330630)
+++ releng/10.3/sys/conf/newvers.sh	Thu Mar  8 06:17:07 2018	(r330631)
@@ -32,7 +32,7 @@
 
 TYPE="FreeBSD"
 REVISION="10.3"
-BRANCH="RELEASE-p27"
+BRANCH="RELEASE-p28"
 if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi

Modified: releng/10.4/UPDATING
==============================================================================
--- releng/10.4/UPDATING	Thu Mar  8 05:41:53 2018	(r330630)
+++ releng/10.4/UPDATING	Thu Mar  8 06:17:07 2018	(r330631)
@@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITHOUT_CLANG to b
 stable/10, and then rebuild without this option. The bootstrap process from
 older version of current is a bit fragile.
 
+20180307	p7	FreeBSD-SA-18:01.ipsec [revised]
+
+	Fix ipsec validation and use-after-free.
+
 20180307	p6	FreeBSD-SA-18:01.ipsec
 			FreeBSD-SA-18:02.ntp
 			FreeBSD-EN-18:01.tzdata

Modified: releng/10.4/sys/conf/newvers.sh
==============================================================================
--- releng/10.4/sys/conf/newvers.sh	Thu Mar  8 05:41:53 2018	(r330630)
+++ releng/10.4/sys/conf/newvers.sh	Thu Mar  8 06:17:07 2018	(r330631)
@@ -32,7 +32,7 @@
 
 TYPE="FreeBSD"
 REVISION="10.4"
-BRANCH="RELEASE-p6"
+BRANCH="RELEASE-p7"
 if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi