Add UPDATING entries and bump version.

Approved by:	so
Approved by:	re (implicit for releng/12.2)

2 files changed, 15 insertions, 1 deletions

diff --git a/UPDATING b/UPDATING
index e1e5f8b0b6ae..a3aba1aab238 100644
--- a/UPDATING
+++ b/UPDATING
@@ -16,6 +16,20 @@ 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.
 
+20200915	p4	FreeBSD-SA-20:27.ure
+			FreeBSD-SA-20:28.bhyve_vmcs
+			FreeBSD-SA-20:29.bhyve_svm
+			FreeBSD-SA-20:30.ftpd
+
+        Fix ure device driver susceptible to packet-in-packet attack.
+          [SA-20:27.ure]
+
+        Fix bhyve privilege escalation via VMCS access. [SA-20:28.bhyve_vmcs]
+
+        Fix bhyve SVM guest escape. [SA-20:29.bhyve_svm]
+
+        Fix ftpd privilege escalation via ftpchroot. [SA-20:30.ftpd]
+
 20200902	p3	FreeBSD-EN-20:17.linuxthread
 			FreeBSD-EN-20:18.getfsstat
 			FreeBSD-SA-20:25.sctp
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 7a5a5352ea33..21a07a2c785a 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -44,7 +44,7 @@
 
 TYPE="FreeBSD"
 REVISION="11.4"
-BRANCH="RELEASE-p3"
+BRANCH="RELEASE-p4"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi