diff options
| author | Jacques Vidrine <nectar@FreeBSD.org> | 2002-07-31 13:19:08 +0000 |
|---|---|---|
| committer | Jacques Vidrine <nectar@FreeBSD.org> | 2002-07-31 13:19:08 +0000 |
| commit | bb2ca84e2c94536ceb44c1dea8b5bfe4fa2f78b6 (patch) | |
| tree | fc8861edbb8cdcd614aade902b55f5f312e78e40 | |
| parent | f1689a257af7d2f8e1aae29e5c30ccbd3960ccf7 (diff) | |
| download | src-bb2ca84e2c94536ceb44c1dea8b5bfe4fa2f78b6.tar.gz src-bb2ca84e2c94536ceb44c1dea8b5bfe4fa2f78b6.zip | |
Notes
| -rw-r--r-- | UPDATING | 3 | ||||
| -rw-r--r-- | lib/libc/xdr/xdr_array.c | 7 | ||||
| -rw-r--r-- | sys/conf/newvers.sh | 2 |
3 files changed, 8 insertions, 4 deletions
@@ -19,6 +19,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. +20020731: p12 + A bounds checking error in the XDR decoder was corrected. + 20020730: p11 FreeBSD-SA-02:32.pppd A race condition in pppd(8) was corrected. diff --git a/lib/libc/xdr/xdr_array.c b/lib/libc/xdr/xdr_array.c index b7d36fea5ca3..7fb0552326d3 100644 --- a/lib/libc/xdr/xdr_array.c +++ b/lib/libc/xdr/xdr_array.c @@ -73,11 +73,12 @@ xdr_array(xdrs, addrp, sizep, maxsize, elsize, elproc) register u_int nodesize; /* like strings, arrays are really counted arrays */ - if (! xdr_u_int(xdrs, sizep)) { + if (!xdr_u_int(xdrs, sizep)) { return (FALSE); } c = *sizep; - if ((c > maxsize) && (xdrs->x_op != XDR_FREE)) { + if ((c > maxsize && UINT_MAX/elsize < c) && + (xdrs->x_op != XDR_FREE)) { return (FALSE); } nodesize = c * elsize; @@ -145,7 +146,7 @@ xdr_vector(xdrs, basep, nelem, elemsize, xdr_elem) elptr = basep; for (i = 0; i < nelem; i++) { - if (! (*xdr_elem)(xdrs, elptr, LASTUNSIGNED)) { + if (!(*xdr_elem)(xdrs, elptr, LASTUNSIGNED)) { return(FALSE); } elptr += elemsize; diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index fb79c574562f..fbfa5d879e32 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -36,7 +36,7 @@ TYPE="FreeBSD" REVISION="4.5" -BRANCH="RELEASE-p11" +BRANCH="RELEASE-p12" RELEASE="${REVISION}-${BRANCH}" VERSION="${TYPE} ${RELEASE}" |