aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Cox <alc@FreeBSD.org>2003-08-01 02:21:54 +0000
committerAlan Cox <alc@FreeBSD.org>2003-08-01 02:21:54 +0000
commit882d8469af712c71ef40cfb990cadc2fd5b7bd91 (patch)
tree8197602a542d2c698ece4dfc0e8379d74a0194fb
parent6a3f229e170533b0175087c947e8d32c046bea80 (diff)
Notes
-rw-r--r--sys/kern/sys_generic.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c
index e3393f3b3dfd..eec9c764cd0b 100644
--- a/sys/kern/sys_generic.c
+++ b/sys/kern/sys_generic.c
@@ -468,25 +468,20 @@ writev(td, uap)
struct uio ktruio;
#endif
- mtx_lock(&Giant);
- if ((error = fget_write(td, uap->fd, &fp)) != 0) {
- error = EBADF;
- goto done2;
- }
+ if ((error = fget_write(td, uap->fd, &fp)) != 0)
+ return (EBADF);
+ needfree = NULL;
/* 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) {
- needfree = NULL;
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_WRITE;
@@ -543,8 +538,6 @@ done:
fdrop(fp, td);
if (needfree)
FREE(needfree, M_IOV);
-done2:
- mtx_unlock(&Giant);
return (error);
}