summaryrefslogtreecommitdiffstats
path: root/sys/conf/newvers.sh
diff options
context:
space:
mode:
authorglebius <glebius@FreeBSD.org>2016-10-25 17:11:20 +0000
committerglebius <glebius@FreeBSD.org>2016-10-25 17:11:20 +0000
commit166093516c6aacc3b4828524e9ddc45bfbdd279c (patch)
tree3fc6fc37e3e5716d0163bc1ffee79a626d821657 /sys/conf/newvers.sh
parent1649f1572fc22ec9708f6f62c0fff2b55ac40096 (diff)
downloadFreeBSD-src-166093516c6aacc3b4828524e9ddc45bfbdd279c.zip
FreeBSD-src-166093516c6aacc3b4828524e9ddc45bfbdd279c.tar.gz
Revised SA-16:15. The initial patch didn't cover all possible overflows
based on passing incorrect parameters to sysarch(2). [1] Fix unchecked array reference in the VGA device emulation code. [2] Security: SA-16:15 [1] Security: SA-16:32 [2] Approved by: so
Diffstat (limited to 'sys/conf/newvers.sh')
-rw-r--r--sys/conf/newvers.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 822c8979..f734ad1 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,7 +32,7 @@
TYPE="FreeBSD"
REVISION="11.0"
-BRANCH="RELEASE-p1"
+BRANCH="RELEASE-p2"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
OpenPOWER on IntegriCloud