From 38e81cedcfb3fc38193cb9d12640e836a12abdf6 Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Sat, 30 Nov 1996 15:03:05 +0000
Subject: [PATCH] Throw away input if CREAD is not set.  POSIX requires no
 characters to be received in this case even if the hardware doesn't have a
 CREAD bit.

Found by:	NIST-PCTS
---
 sys/dev/sio/sio.c  | 5 +++--
 sys/i386/isa/sio.c | 5 +++--
 sys/isa/sio.c      | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index 72a442482d3..5cc1f6c1593 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.149 1996/11/13 18:31:51 bde Exp $
+ *	$Id: sio.c,v 1.150 1996/11/30 14:51:04 bde Exp $
  */
 
 #include "opt_comconsole.h"
@@ -1758,7 +1758,8 @@ repeat:
 			enable_intr();
 			(*linesw[tp->t_line].l_start)(tp);
 		}
-		if (incc <= 0 || !(tp->t_state & TS_ISOPEN))
+		if (incc <= 0 || !(tp->t_state & TS_ISOPEN) ||
+		    !(tp->t_cflag & CREAD))
 			continue;
 		/*
 		 * Avoid the grotesquely inefficient lineswitch routine
diff --git a/sys/i386/isa/sio.c b/sys/i386/isa/sio.c
index 72a442482d3..5cc1f6c1593 100644
--- a/sys/i386/isa/sio.c
+++ b/sys/i386/isa/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.149 1996/11/13 18:31:51 bde Exp $
+ *	$Id: sio.c,v 1.150 1996/11/30 14:51:04 bde Exp $
  */
 
 #include "opt_comconsole.h"
@@ -1758,7 +1758,8 @@ repeat:
 			enable_intr();
 			(*linesw[tp->t_line].l_start)(tp);
 		}
-		if (incc <= 0 || !(tp->t_state & TS_ISOPEN))
+		if (incc <= 0 || !(tp->t_state & TS_ISOPEN) ||
+		    !(tp->t_cflag & CREAD))
 			continue;
 		/*
 		 * Avoid the grotesquely inefficient lineswitch routine
diff --git a/sys/isa/sio.c b/sys/isa/sio.c
index 72a442482d3..5cc1f6c1593 100644
--- a/sys/isa/sio.c
+++ b/sys/isa/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.149 1996/11/13 18:31:51 bde Exp $
+ *	$Id: sio.c,v 1.150 1996/11/30 14:51:04 bde Exp $
  */
 
 #include "opt_comconsole.h"
@@ -1758,7 +1758,8 @@ repeat:
 			enable_intr();
 			(*linesw[tp->t_line].l_start)(tp);
 		}
-		if (incc <= 0 || !(tp->t_state & TS_ISOPEN))
+		if (incc <= 0 || !(tp->t_state & TS_ISOPEN) ||
+		    !(tp->t_cflag & CREAD))
 			continue;
 		/*
 		 * Avoid the grotesquely inefficient lineswitch routine