aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacques Vidrine <nectar@FreeBSD.org>2002-08-01 12:24:20 +0000
committerJacques Vidrine <nectar@FreeBSD.org>2002-08-01 12:24:20 +0000
commit8469435a8210ec7c5b087ef6b29c118e01d553b0 (patch)
tree3df46edc424593b52a7ab0ca6b745b6903150ef8
parent27d2299a89ea116bc0ff84fe0cd3afc9a6b7b648 (diff)
downloadsrc-8469435a8210ec7c5b087ef6b29c118e01d553b0.tar.gz
src-8469435a8210ec7c5b087ef6b29c118e01d553b0.zip
The fix applied to the XDR decoder in lib/libc/xdr/xdr_array.c revision
1.8.6.1 was incorrect.
Notes
Notes: svn path=/releng/4.4/; revision=101151
-rw-r--r--UPDATING5
-rw-r--r--lib/libc/xdr/xdr_array.c2
-rw-r--r--sys/conf/newvers.sh2
3 files changed, 6 insertions, 3 deletions
diff --git a/UPDATING b/UPDATING
index d68fefaf933f..e3eb54b2362a 100644
--- a/UPDATING
+++ b/UPDATING
@@ -17,13 +17,16 @@ 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.
+20020801: p22 FreeBSD-SA-02:34.rpc
+ The original fix applied to the XDR decoder was in error.
+
20020731: p21
A bounds checking error in FFS filesize limits was corrected.
20020731: p20
Upgrade to OpenSSL 0.9.6e.
-20020731: p19
+20020731: p19 FreeBSD-SA-02:34.rpc
A bounds checking error in the XDR decoder was corrected.
20020730: p18 FreeBSD-SA-02:32.pppd
diff --git a/lib/libc/xdr/xdr_array.c b/lib/libc/xdr/xdr_array.c
index 57e91b3c62aa..040becf27d17 100644
--- a/lib/libc/xdr/xdr_array.c
+++ b/lib/libc/xdr/xdr_array.c
@@ -78,7 +78,7 @@ xdr_array(xdrs, addrp, sizep, maxsize, elsize, elproc)
return (FALSE);
}
c = *sizep;
- if ((c > maxsize && UINT_MAX/elsize < c) &&
+ if ((c > maxsize || UINT_MAX/elsize < c) &&
(xdrs->x_op != XDR_FREE)) {
return (FALSE);
}
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index fa7ad33f6339..edf0ed8719b3 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -36,7 +36,7 @@
TYPE="FreeBSD"
REVISION="4.4"
-BRANCH="RELEASE-p21"
+BRANCH="RELEASE-p22"
RELEASE="${REVISION}-${BRANCH}"
VERSION="${TYPE} ${RELEASE}"