From a0904945438caf7ec6824871e8f18d98ba0ff226 Mon Sep 17 00:00:00 2001
From: dtucker <dtucker>
Date: Thu, 14 Jul 2005 07:05:51 +0000
Subject:    - markus@cvs.openbsd.org 2005/07/08 09:41:33      [channels.h]    
  race when efd gets closed while there is still buffered data:      change
 CHANNEL_EFD_OUTPUT_ACTIVE()         1) c->efd must always be valid AND       
  2a) no EOF has been seen OR         2b) there is buffered data      report,
 initial fix and testing Chuck Cranor

---
 channels.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'channels.h')

diff --git a/channels.h b/channels.h
index f87db6af..b89b7c95 100644
--- a/channels.h
+++ b/channels.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: channels.h,v 1.77 2005/06/16 03:38:36 djm Exp $	*/
+/*	$OpenBSD: channels.h,v 1.78 2005/07/08 09:41:33 markus Exp $	*/
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -149,7 +149,7 @@ struct Channel {
 	buffer_len(&c->extended) > 0))
 #define CHANNEL_EFD_OUTPUT_ACTIVE(c) \
 	(compat20 && c->extended_usage == CHAN_EXTENDED_WRITE && \
-	((c->efd != -1 && !(c->flags & (CHAN_EOF_RCVD|CHAN_CLOSE_RCVD))) || \
+	c->efd != -1 && (!(c->flags & (CHAN_EOF_RCVD|CHAN_CLOSE_RCVD)) || \
 	buffer_len(&c->extended) > 0))
 
 /* channel management */
-- 
cgit v1.2.1