diff options
Diffstat (limited to 'sys/fs/fdescfs/fdesc_vnops.c')
| -rw-r--r-- | sys/fs/fdescfs/fdesc_vnops.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c index bec6bc7..c563298 100644 --- a/sys/fs/fdescfs/fdesc_vnops.c +++ b/sys/fs/fdescfs/fdesc_vnops.c @@ -35,7 +35,7 @@ * * @(#)fdesc_vnops.c 8.9 (Berkeley) 1/21/94 * - * $Id: fdesc_vnops.c,v 1.14 1995/12/05 19:12:05 bde Exp $ + * $Id: fdesc_vnops.c,v 1.15 1995/12/08 11:17:40 julian Exp $ */ /* @@ -170,10 +170,18 @@ loop: } fdcache_lock |= FDL_LOCKED; + /* + * Do the MALLOC before the getnewvnode since doing so afterward + * might cause a bogus v_data pointer to get dereferenced + * elsewhere if MALLOC should block. + */ + MALLOC(fd, struct fdescnode *, sizeof(struct fdescnode), M_TEMP, M_WAITOK); + error = getnewvnode(VT_FDESC, mp, fdesc_vnodeop_p, vpp); - if (error) + if (error) { + FREE(fd, M_TEMP); goto out; - MALLOC(fd, void *, sizeof(struct fdescnode), M_TEMP, M_WAITOK); + } (*vpp)->v_data = fd; fd->fd_vnode = *vpp; fd->fd_type = ftype; |
