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

Explicitly use curthread while manipulating td_fpop during last close

Browse Source 
of a devfs file descriptor in devfs_close_f().  The passed in td argument
may be NULL if the close was invoked by garbage collection of open
file descriptors in pending control messages in the socket buffer of a
UNIX domain socket after it was closed.

PR:		kern/151758
Submitted by:	Andrey Shidakov  andrey shidakov ru
Submitted by:	Ruben van Staveren  ruben verweg com
Reviewed by:	kib
MFC after:	2 weeks
This commit is contained in:
John Baldwin 2011-12-09 17:49:34 +00:00
parent cdea31e305
commit e517e6f12c
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/fs/devfs/devfs_vnops.c
View File

@ -602,10 +602,14 @@ devfs_close_f(struct file *fp, struct thread *td)
int error;
struct file *fpop;
fpop = td->td_fpop;
td->td_fpop = fp;
/*
* NB: td may be NULL if this descriptor is closed due to
* garbage collection from a closed UNIX domain socket.
*/
fpop = curthread->td_fpop;
curthread->td_fpop = fp;
error = vnops.fo_close(fp, td);
td->td_fpop = fpop;
curthread->td_fpop = fpop;
/*
* The f_cdevpriv cannot be assigned non-NULL value while we