diff options
| author | Jacques Vidrine <nectar@FreeBSD.org> | 2003-10-02 15:58:53 +0000 |
|---|---|---|
| committer | Jacques Vidrine <nectar@FreeBSD.org> | 2003-10-02 15:58:53 +0000 |
| commit | 9fd7edd2204124afa9bebf46efd1a2710d067244 (patch) | |
| tree | dfbf02f574e0dac6e09989a3ef7ce1259769da54 | |
| parent | 7004eb8b27d865035d7b3902337d846099095999 (diff) | |
| download | src-test2-9fd7edd2204124afa9bebf46efd1a2710d067244.tar.gz src-test2-9fd7edd2204124afa9bebf46efd1a2710d067244.zip | |
Notes
| -rw-r--r-- | UPDATING | 3 | ||||
| -rw-r--r-- | sys/conf/newvers.sh | 2 | ||||
| -rw-r--r-- | sys/kern/sys_generic.c | 12 |
3 files changed, 10 insertions, 7 deletions
@@ -17,6 +17,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. +20031002: p21 FreeBSD-SA-03:16.filedesc + Correct a reference counting bug in readv(2). + 20030924: p20 FreeBSD-SA-03:14.arp Updated fix for arplookup bug. diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 3df030b1cbfc..ef12eaf063af 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -36,7 +36,7 @@ TYPE="FreeBSD" REVISION="4.7" -BRANCH="RELEASE-p20" +BRANCH="RELEASE-p21" RELEASE="${REVISION}-${BRANCH}" VERSION="${TYPE} ${RELEASE}" diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c index bcea567e51e0..bab39b55da35 100644 --- a/sys/kern/sys_generic.c +++ b/sys/kern/sys_generic.c @@ -231,7 +231,7 @@ readv(p, uap) register struct filedesc *fdp = p->p_fd; struct uio auio; register struct iovec *iov; - struct iovec *needfree; + struct iovec *needfree = NULL; struct iovec aiov[UIO_SMALLIOV]; long i, cnt, error = 0; u_int iovlen; @@ -245,14 +245,14 @@ readv(p, uap) /* note: can't use iovlen until iovcnt is validated */ iovlen = uap->iovcnt * sizeof (struct iovec); if (uap->iovcnt > UIO_SMALLIOV) { - if (uap->iovcnt > UIO_MAXIOV) - return (EINVAL); + if (uap->iovcnt > UIO_MAXIOV) { + error = EINVAL; + goto done; + } MALLOC(iov, struct iovec *, iovlen, M_IOV, M_WAITOK); needfree = iov; - } else { + } else iov = aiov; - needfree = NULL; - } auio.uio_iov = iov; auio.uio_iovcnt = uap->iovcnt; auio.uio_rw = UIO_READ; |