Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a race condition where a writer could already have closed the fifo 

before the reader woke up - this made the reader loop again, waiting
for another writer, even though there was input available.

Thanks to Jaromir for spotting the real cause and sugesting a solution.

This should fix PR port-sparc64/20283.
This commit is contained in:
martin 2003-03-17 00:06:24 +00:00
parent 5ef9540a69
commit b38f12bdd4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/miscfs/fifofs/fifo_vnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fifo_vnops.c,v 1.38 2003/03/02 18:54:50 jdolecek Exp $ */ /* $NetBSD: fifo_vnops.c,v 1.39 2003/03/17 00:06:24 martin Exp $ */
/* /*
* Copyright (c) 1990, 1993, 1995 * Copyright (c) 1990, 1993, 1995
@ -36,7 +36,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: fifo_vnops.c,v 1.38 2003/03/02 18:54:50 jdolecek Exp $"); __KERNEL_RCSID(0, "$NetBSD: fifo_vnops.c,v 1.39 2003/03/17 00:06:24 martin Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -208,7 +208,7 @@ fifo_open(void *v)
if (ap->a_mode & FREAD) { if (ap->a_mode & FREAD) {
if (ap->a_mode & O_NONBLOCK) { if (ap->a_mode & O_NONBLOCK) {
} else { } else {
while (fip->fi_writers == 0) { while (!soreadable(fip->fi_readsock) && fip->fi_writers == 0) {
VOP_UNLOCK(vp, 0); VOP_UNLOCK(vp, 0);
error = tsleep((caddr_t)&fip->fi_readers, error = tsleep((caddr_t)&fip->fi_readers,
PCATCH | PSOCK, "fifor", 0); PCATCH | PSOCK, "fifor", 0);