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

filemon_dtr: Lock the associated filemon handle before writing to it.

Browse Source 
Reported by:	mjg
MFC after:	2 weeks
Sponsored by:	EMC / Isilon Storage Division
This commit is contained in:
Bryan Drewery 2016-01-27 21:37:43 +00:00
parent abe53f7e91
commit 50c99f32a9
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/dev/filemon/filemon.c
View File

@ -126,14 +126,16 @@ filemon_dtr(void *data)
struct filemon *filemon = data;
if (filemon != NULL) {
struct file *fp = filemon->fp;
struct file *fp;
/* Get exclusive write access. */
/* Follow same locking order as filemon_pid_check. */
filemon_lock_write();
filemon_filemon_lock(filemon);
/* Remove from the in-use list. */
TAILQ_REMOVE(&filemons_inuse, filemon, link);
fp = filemon->fp;
filemon->fp = NULL;
filemon->pid = -1;
@ -141,6 +143,7 @@ filemon_dtr(void *data)
TAILQ_INSERT_TAIL(&filemons_free, filemon, link);
/* Give up write access. */
filemon_filemon_unlock(filemon);
filemon_unlock_write();
if (fp != NULL)