aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Belousov <kib@FreeBSD.org>2021-07-22 10:27:43 +0000
committerKonstantin Belousov <kib@FreeBSD.org>2021-08-03 09:52:36 +0000
commit2a56a5c2c21a7bf1fc321a60fffbd8d59970633b (patch)
tree6a259799cbc44f5bdd1c012e9ba5425f28420623
parenta3c7e571c08944082d134f8a2b883e80e9f0321a (diff)
fifofs: fifo vnode might be relocked before VOP_OPEN() is called
(cherry picked from commit 10db1896495b744aa5b039dd4ef1973b7a339379)
-rw-r--r--sys/fs/fifofs/fifo_vnops.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c
index d2a51de84fba..861f1b40a744 100644
--- a/sys/fs/fifofs/fifo_vnops.c
+++ b/sys/fs/fifofs/fifo_vnops.c
@@ -282,9 +282,21 @@ fifo_close(ap)
struct pipe *cpipe;
vp = ap->a_vp;
+ ASSERT_VOP_ELOCKED(vp, "fifo_close");
fip = vp->v_fifoinfo;
+
+ /*
+ * During open, it is possible that the fifo vnode is relocked
+ * after the vnode is instantiated but before VOP_OPEN() is
+ * done. For instance, vn_open_vnode() might need to upgrade
+ * vnode lock, or ffs_vput_pair() needs to unlock vp to sync
+ * dvp. In this case, reclaim can observe us with v_fifoinfo
+ * equal to NULL.
+ */
+ if (fip == NULL)
+ return (0);
+
cpipe = fip->fi_pipe;
- ASSERT_VOP_ELOCKED(vp, "fifo_close");
if (ap->a_fflag & FREAD) {
fip->fi_readers--;
if (fip->fi_readers == 0) {