d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

If fifo_open() is interrupted, fifo_close() may not get called, causing

Browse Source 
a resource leak.  Move the resource deallocation code from fifo_close()
to a new function, fifo_cleanup(), and call fifo_cleanup() from
fifo_close() and the appropriate places in fifo_open().

Tested by: 	Lukas Ertl
Pointy hat to:	truckman
This commit is contained in:
truckman 2003-11-10 22:21:00 +00:00
parent c038927dce
commit 2305818240
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
sys/fs/fifofs/fifo_vnops.c
View File

@ -153,6 +153,26 @@ fifo_lookup(ap)
return (ENOTDIR);
}
/*
* Dispose of fifo resources.
* Should be called with vnode locked
*/
static void
fifo_cleanup(struct vnode *vp)
{
struct fifoinfo *fip = vp->v_fifoinfo;
VI_LOCK(vp);
if (vp->v_usecount == 1) {
vp->v_fifoinfo = NULL;
VI_UNLOCK(vp);
(void)soclose(fip->fi_readsock);
(void)soclose(fip->fi_writesock);
FREE(fip, M_VNODE);
} else
VI_UNLOCK(vp);
}
/*
* Open called to set up a new instance of a fifo or
* to find an active instance of a fifo.
@ -249,6 +269,7 @@ fail1:
fip->fi_readers--;
if (fip->fi_readers == 0)
socantsendmore(fip->fi_writesock);
fifo_cleanup(vp);
return (error);
}
VI_LOCK(vp);
@ -268,6 +289,7 @@ fail1:
fip->fi_writers--;
if (fip->fi_writers == 0)
socantrcvmore(fip->fi_readsock);
fifo_cleanup(vp);
return (error);
}
/*
@ -554,15 +576,7 @@ fifo_close(ap)
if (fip->fi_writers == 0)
socantrcvmore(fip->fi_readsock);
}
VI_LOCK(vp);
if (vp->v_usecount == 1) {
vp->v_fifoinfo = NULL;
VI_UNLOCK(vp);
(void)soclose(fip->fi_readsock);
(void)soclose(fip->fi_writesock);
FREE(fip, M_VNODE);
} else
VI_UNLOCK(vp);
fifo_cleanup(vp);
VOP_UNLOCK(vp, 0, td);
return (0);
}