diff options
Diffstat (limited to 'sys/fs/portalfs')
| -rw-r--r-- | sys/fs/portalfs/portal_vfsops.c | 19 | ||||
| -rw-r--r-- | sys/fs/portalfs/portal_vnops.c | 18 |
2 files changed, 25 insertions, 12 deletions
diff --git a/sys/fs/portalfs/portal_vfsops.c b/sys/fs/portalfs/portal_vfsops.c index 6a5b1ba04ca0..500b9ef4089c 100644 --- a/sys/fs/portalfs/portal_vfsops.c +++ b/sys/fs/portalfs/portal_vfsops.c @@ -35,7 +35,7 @@ * * @(#)portal_vfsops.c 8.6 (Berkeley) 1/21/94 * - * $Id: portal_vfsops.c,v 1.9 1995/11/16 11:24:06 bde Exp $ + * $Id: portal_vfsops.c,v 1.10 1995/12/11 09:24:43 phk Exp $ */ /* @@ -105,6 +105,7 @@ portal_mount(mp, path, data, ndp, p) struct portalmount *fmp; struct socket *so; struct vnode *rvp; + struct portalnode *pn; u_int size; int error; @@ -125,14 +126,20 @@ portal_mount(mp, path, data, ndp, p) if (so->so_proto->pr_domain->dom_family != AF_UNIX) return (ESOCKTNOSUPPORT); + MALLOC(pn, struct portalnode *, sizeof(struct portalnode), + M_TEMP, M_WAITOK); + + MALLOC(fmp, struct portalmount *, sizeof(struct portalmount), + M_UFSMNT, M_WAITOK); /* XXX */ + error = getnewvnode(VT_PORTAL, mp, portal_vnodeop_p, &rvp); /* XXX */ - if (error) + if (error) { + FREE(fmp, M_UFSMNT); + FREE(pn, M_TEMP); return (error); - MALLOC(rvp->v_data, void *, sizeof(struct portalnode), - M_TEMP, M_WAITOK); + } - fmp = (struct portalmount *) malloc(sizeof(struct portalmount), - M_UFSMNT, M_WAITOK); /* XXX */ + rvp->v_data = pn; rvp->v_type = VDIR; rvp->v_flag |= VROOT; VTOPORTAL(rvp)->pt_arg = 0; diff --git a/sys/fs/portalfs/portal_vnops.c b/sys/fs/portalfs/portal_vnops.c index 27780bf42b2c..fcd595828733 100644 --- a/sys/fs/portalfs/portal_vnops.c +++ b/sys/fs/portalfs/portal_vnops.c @@ -35,7 +35,7 @@ * * @(#)portal_vnops.c 8.8 (Berkeley) 1/21/94 * - * $Id: portal_vnops.c,v 1.10 1995/12/11 09:24:45 phk Exp $ + * $Id: portal_vnops.c,v 1.11 1996/02/13 18:16:25 wollman Exp $ */ /* @@ -126,15 +126,21 @@ portal_lookup(ap) return (0); } + /* + * 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(pt, struct portalnode *, sizeof(struct portalnode), + M_TEMP, M_WAITOK); error = getnewvnode(VT_PORTAL, ap->a_dvp->v_mount, portal_vnodeop_p, &fvp); - if (error) + if (error) { + FREE(pt, M_TEMP); goto bad; + } fvp->v_type = VREG; - MALLOC(fvp->v_data, void *, sizeof(struct portalnode), - M_TEMP, M_WAITOK); - - pt = VTOPORTAL(fvp); + fvp->v_data = pt; /* * Save all of the remaining pathname and * advance the namei next pointer to the end |