svn commit: r357220 - in releng: 11.3 11.3/sys/conf 12.0 12.0/sys/conf 12.1 12.1/sys/conf

[Gordon Tetlow]

Author: gordon
Date: Tue Jan 28 18:58:37 2020
New Revision: 357220
URL: https://svnweb.freebsd.org/changeset/base/357220

Log:
  Add UPDATING entries and bump version.
  
  Approved by:	so

Modified:
  releng/11.3/UPDATING
  releng/11.3/sys/conf/newvers.sh
  releng/12.0/UPDATING
  releng/12.0/sys/conf/newvers.sh
  releng/12.1/UPDATING
  releng/12.1/sys/conf/newvers.sh

Modified: releng/11.3/UPDATING
==============================================================================
--- releng/11.3/UPDATING	Tue Jan 28 18:57:45 2020	(r357219)
+++ releng/11.3/UPDATING	Tue Jan 28 18:58:37 2020	(r357220)
@@ -16,6 +16,19 @@ from older versions of FreeBSD, try WITHOUT_CLANG and 
 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.
 
+20200128	p6	FreeBSD-EN-20:01.ssp
+			FreeBSD-EN-20:02.nmount
+			FreeBSD-SA-20:01.libfetch
+			FreeBSD-SA-20:03.thrmisc
+
+	Fix imprecise ordering of SSP canary initialization [EN-20:01.ssp]
+	
+	Fix nmount invalid pointer dereference [EN-20:02.nmount]
+	
+	Fix libfetch buffer overflow [SA-20:01.libfetch]
+
+	Fix kernel stack data disclosure [SA-20:03.thrmisc]
+	
 20191112	p5	FreeBSD-SA-19:25.mcepsc
 
 	Fix Machine Check Exception on Page Size Change [SA-19:25.mcepsc]

Modified: releng/11.3/sys/conf/newvers.sh
==============================================================================
--- releng/11.3/sys/conf/newvers.sh	Tue Jan 28 18:57:45 2020	(r357219)
+++ releng/11.3/sys/conf/newvers.sh	Tue Jan 28 18:58:37 2020	(r357220)
@@ -44,7 +44,7 @@
 
 TYPE="FreeBSD"
 REVISION="11.3"
-BRANCH="RELEASE-p5"
+BRANCH="RELEASE-p6"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi

Modified: releng/12.0/UPDATING
==============================================================================
--- releng/12.0/UPDATING	Tue Jan 28 18:57:45 2020	(r357219)
+++ releng/12.0/UPDATING	Tue Jan 28 18:58:37 2020	(r357220)
@@ -16,6 +16,22 @@ from older versions of FreeBSD, try WITHOUT_CLANG and 
 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.
 
+20200128	p13	FreeBSD-EN-20:01.ssp
+			FreeBSD-EN-20:02.nmount
+			FreeBSD-SA-20:01.libfetch
+			FreeBSD-SA-20:02.ipsec
+			FreeBSD-SA-20:03.thrmisc
+
+        Fix imprecise ordering of SSP canary initialization [EN-20:01.ssp]
+
+        Fix nmount invalid pointer dereference [EN-20:02.nmount]
+
+        Fix libfetch buffer overflow [SA-20:01.libfetch]
+
+        Fix missing IPsec anti-replay window check [SA-20:02.ipsec]
+
+        Fix kernel stack data disclosure [SA-20:03.thrmisc]
+
 20191112	p12	FreeBSD-EN-19:19.loader
 			FreeBSD-SA-19:25.mcepsc
 

Modified: releng/12.0/sys/conf/newvers.sh
==============================================================================
--- releng/12.0/sys/conf/newvers.sh	Tue Jan 28 18:57:45 2020	(r357219)
+++ releng/12.0/sys/conf/newvers.sh	Tue Jan 28 18:58:37 2020	(r357220)
@@ -46,7 +46,7 @@
 
 TYPE="FreeBSD"
 REVISION="12.0"
-BRANCH="RELEASE-p12"
+BRANCH="RELEASE-p13"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi

Modified: releng/12.1/UPDATING
==============================================================================
--- releng/12.1/UPDATING	Tue Jan 28 18:57:45 2020	(r357219)
+++ releng/12.1/UPDATING	Tue Jan 28 18:58:37 2020	(r357220)
@@ -16,6 +16,16 @@ from older versions of FreeBSD, try WITHOUT_CLANG and 
 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.
 
+20200128	p2	FreeBSD-EN-20:01.ssp
+			FreeBSD-SA-20:01.libfetch
+			FreeBSD-SA-20:03.thrmisc
+
+        Fix imprecise ordering of SSP canary initialization [EN-20:01.ssp]
+
+        Fix libfetch buffer overflow [SA-20:01.libfetch]
+
+        Fix kernel stack data disclosure [SA-20:03.thrmisc]
+
 20191112	p1	FreeBSD-EN-19:19.loader
 			FreeBSD-SA-19:25.mcepsc
 

Modified: releng/12.1/sys/conf/newvers.sh
==============================================================================
--- releng/12.1/sys/conf/newvers.sh	Tue Jan 28 18:57:45 2020	(r357219)
+++ releng/12.1/sys/conf/newvers.sh	Tue Jan 28 18:58:37 2020	(r357220)
@@ -46,7 +46,7 @@
 
 TYPE="FreeBSD"
 REVISION="12.1"
-BRANCH="RELEASE-p1"
+BRANCH="RELEASE-p2"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi