aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--UPDATING3
-rw-r--r--sys/conf/newvers.sh2
2 files changed, 4 insertions, 1 deletions
diff --git a/UPDATING b/UPDATING
index 6f16d02c7659..1ddfd49ba0c3 100644
--- a/UPDATING
+++ b/UPDATING
@@ -14,6 +14,9 @@ minimal number of processes, if possible, for that patch. For those
updates that don't have an advisory, or to be safe, you can do a full
build and install as described in the COMMON ITEMS section.
+20050406: p14 FreeBSD-SA-05:03.amd64
+ Correctly initialize the I/O permission bitmap on amd64.
+
20041201: p13 FreeBSD-SA-04:17.procfs
Fix a tainted pointer dereference in procfs(5) and linprocfs(5)
which could allow a local attacker to panic a system and/or read
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index ca9d0b6883f6..93d7dfa4f6e1 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -36,7 +36,7 @@
TYPE="FreeBSD"
REVISION="5.2.1"
-BRANCH="RELEASE-p13"
+BRANCH="RELEASE-p14"
RELEASE="${REVISION}-${BRANCH}"
VERSION="${TYPE} ${RELEASE}"