aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--UPDATING3
-rw-r--r--contrib/opie/libopie/readrec.c4
-rw-r--r--sys/conf/newvers.sh2
3 files changed, 5 insertions, 4 deletions
diff --git a/UPDATING b/UPDATING
index 815170c9a211..941fff203d3f 100644
--- a/UPDATING
+++ b/UPDATING
@@ -8,6 +8,9 @@ Items affecting the ports and packages system can be found in
/usr/ports/UPDATING. Please read that file before running
portupgrade.
+20100526: p10 FreeBSD-SA-10:05.opie
+ Fix a one-NUL-byte buffer overflow in libopie. [10:05]
+
20100106: p9 FreeBSD-SA-10:01.bind, FreeBSD-SA-10:02.ntpd
Fix BIND named(8) cache poisoning with DNSSEC validation.
[SA-10:01]
diff --git a/contrib/opie/libopie/readrec.c b/contrib/opie/libopie/readrec.c
index 98ec6589bc1c..0f80315c69c9 100644
--- a/contrib/opie/libopie/readrec.c
+++ b/contrib/opie/libopie/readrec.c
@@ -139,10 +139,8 @@ int __opiereadrec FUNCTION((opie), struct opie *opie)
if (c = strchr(opie->opie_principal, ':'))
*c = 0;
- if (strlen(opie->opie_principal) > OPIE_PRINCIPAL_MAX)
- (opie->opie_principal)[OPIE_PRINCIPAL_MAX] = 0;
- strcpy(principal, opie->opie_principal);
+ strlcpy(principal, opie->opie_principal, sizeof(principal));
do {
if ((opie->opie_recstart = ftell(f)) < 0)
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 4b43da7f2f43..f396929fd175 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,7 +32,7 @@
TYPE="FreeBSD"
REVISION="6.4"
-BRANCH="RELEASE-p9"
+BRANCH="RELEASE-p10"
if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi