aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacques Vidrine <nectar@FreeBSD.org>2003-08-03 23:47:39 +0000
committerJacques Vidrine <nectar@FreeBSD.org>2003-08-03 23:47:39 +0000
commitb9d00679a7179b5e5fa00f02058099dccb31104d (patch)
tree82a7795b93667e0b82592e7eccc6a947119db264
parentf34f1f071af08ba130700bc89278594678702266 (diff)
downloadsrc-b9d00679a7179b5e5fa00f02058099dccb31104d.tar.gz
src-b9d00679a7179b5e5fa00f02058099dccb31104d.zip
realpath(3) bug fix: There was an off-by-one error in computing the
size of the resulting canonical path.
Notes
Notes: svn path=/releng/4.4/; revision=118401
-rw-r--r--UPDATING7
-rw-r--r--lib/libc/stdlib/realpath.c3
-rw-r--r--sys/conf/newvers.sh2
3 files changed, 8 insertions, 4 deletions
diff --git a/UPDATING b/UPDATING
index 7c0874a4b739..54a7f74f6b0e 100644
--- a/UPDATING
+++ b/UPDATING
@@ -17,8 +17,11 @@ 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.
-20030405: p36 FreeBSD-SA-03:05.xdr
- integer overflow errors in the Sun XDR library.
+20030804: p37 FreeBSD-SA-03:08.realpath
+ Correct a single byte buffer overflow in realpath(3).
+
+20030405: p36 FreeBSD-SA-03:05.xdr
+ integer overflow errors in the Sun XDR library.
20030329: p35 FreeBSD-SA-03:07.sendmail
sendmail address parsing buffer overflow.
diff --git a/lib/libc/stdlib/realpath.c b/lib/libc/stdlib/realpath.c
index 0217dde5f6a6..520624a9fef2 100644
--- a/lib/libc/stdlib/realpath.c
+++ b/lib/libc/stdlib/realpath.c
@@ -138,7 +138,8 @@ loop:
rootd = 0;
if (*wbuf) {
- if (strlen(resolved) + strlen(wbuf) + rootd + 1 > MAXPATHLEN) {
+ if (strlen(resolved) + strlen(wbuf) + (1-rootd) + 1 >
+ MAXPATHLEN) {
errno = ENAMETOOLONG;
goto err1;
}
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 6e933a745eb0..a6e8f20ed352 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -36,7 +36,7 @@
TYPE="FreeBSD"
REVISION="4.4"
-BRANCH="RELEASE-p36"
+BRANCH="RELEASE-p37"
RELEASE="${REVISION}-${BRANCH}"
VERSION="${TYPE} ${RELEASE}"