diff options
| author |   matthew <matthew@openbsd.org> | 2014-06-15 20:39:22 +0000 |
|---|---|---|
| committer | matthew <matthew@openbsd.org> | 2014-06-15 20:39:22 +0000 |
| commit | ddd97a9738ac8cd5481940712d33c8170a0865df (patch) | |
| tree | 3a9ac8669e507b1ae0d88406007c0b291ae0e79f | |
| parent | Fix vnode leak in systrace(4). (diff) | |
| download | wireguard-openbsd-ddd97a9738ac8cd5481940712d33c8170a0865df.tar.xz wireguard-openbsd-ddd97a9738ac8cd5481940712d33c8170a0865df.zip | |
Use sizeof(struct file *) consistently for memcpy()'ing fd_ofiles.
Pointed out by Jean-Philippe Ouellet.
| -rw-r--r-- | sys/kern/kern_descrip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 484d3c76691..25604fb196e 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_descrip.c,v 1.108 2014/05/15 03:52:25 guenther Exp $ */ +/* $OpenBSD: kern_descrip.c,v 1.109 2014/06/15 20:39:22 matthew Exp $ */ /* $NetBSD: kern_descrip.c,v 1.42 1996/03/30 22:24:38 christos Exp $ */ /* @@ -956,7 +956,7 @@ fdcopy(struct process *pr) M_FILEDESC, M_WAITOK); } newfdp->fd_nfiles = i; - memcpy(newfdp->fd_ofiles, fdp->fd_ofiles, i * sizeof(struct file **)); + memcpy(newfdp->fd_ofiles, fdp->fd_ofiles, i * sizeof(struct file *)); memcpy(newfdp->fd_ofileflags, fdp->fd_ofileflags, i * sizeof(char)); memcpy(newfdp->fd_himap, fdp->fd_himap, NDHISLOTS(i) * sizeof(u_int)); memcpy(newfdp->fd_lomap, fdp->fd_lomap, NDLOSLOTS(i) * sizeof(u_int)); |