From a23ba974670e43a4d7177dfba67147e67eef15cf Mon Sep 17 00:00:00 2001 From: jhb Date: Thu, 5 Jan 2012 19:36:38 +0000 Subject: [PATCH] MFC 228361: Explicitly use curthread while manipulating td_fpop during last close 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. git-svn-id: svn://svn.freebsd.org/base/stable/8@229628 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sys/fs/devfs/devfs_vnops.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c index 6fec72d4b..0c1a294b3 100644 --- a/sys/fs/devfs/devfs_vnops.c +++ b/sys/fs/devfs/devfs_vnops.c @@ -548,10 +548,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 -- 2.45.0