summaryrefslogtreecommitdiff
path: root/sys/kern
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2012-09-02 05:20:18 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2012-09-02 05:20:18 +0000
commit7d22147b1c4d7d72a257eb3fbae6f781c7ee3613 (patch)
tree440a297797222f3e28f611ea7e29debe6637d2b6 /sys/kern
parentc361628b8cfa6e17bce24d340ec8f34a0906c8c4 (diff)
Do not need bcopy trickery to update the file descriptor
pointer array; we can access it directly. ok guenther
Diffstat (limited to 'sys/kern')
-rw-r--r--sys/kern/uipc_usrreq.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
index 6b5ec3ecba9..d126b85742c 100644
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uipc_usrreq.c,v 1.67 2012/08/23 00:11:56 guenther Exp $ */
+/* $OpenBSD: uipc_usrreq.c,v 1.68 2012/09/02 05:20:17 deraadt Exp $ */
/* $NetBSD: uipc_usrreq.c,v 1.18 1996/02/09 19:00:50 christos Exp $ */
/*
@@ -710,8 +710,6 @@ restart:
*/
rp = ((struct file **)CMSG_DATA(cm));
for (i = 0; i < nfds; i++) {
- bcopy(rp, &fp, sizeof(fp));
- rp++;
if ((error = fdalloc(p, 0, &fdp[i])) != 0) {
/*
* Back out what we've done so far.
@@ -739,7 +737,7 @@ restart:
* fdalloc() works properly.. We finalize it all
* in the loop below.
*/
- p->p_fd->fd_ofiles[fdp[i]] = fp;
+ p->p_fd->fd_ofiles[fdp[i]] = *rp++;
}
/*