From 8f1d6431cdc3b1c3ce727302799ecc234f5fcd66 Mon Sep 17 00:00:00 2001
From: Kenneth R Westerback <krw@cvs.openbsd.org>
Date: Sat, 6 Sep 2008 15:35:03 +0000
Subject: Return EIO when the residual is > xs->datalen, even if SCSI_SILENT is
 set. SCSI_SILENT mediates printing error messages only.

---
 sys/scsi/st.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'sys')

diff --git a/sys/scsi/st.c b/sys/scsi/st.c
index 2d52b0d7c65..50ce51d0994 100644
--- a/sys/scsi/st.c
+++ b/sys/scsi/st.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: st.c,v 1.83 2008/06/22 16:32:06 krw Exp $	*/
+/*	$OpenBSD: st.c,v 1.84 2008/09/06 15:35:02 krw Exp $	*/
 /*	$NetBSD: st.c,v 1.71 1997/02/21 23:03:49 thorpej Exp $	*/
 
 /*
@@ -1996,13 +1996,12 @@ st_interpret_sense(struct scsi_xfer *xs)
 				/*
 				 * huh? the residual is bigger than the request
 				 */
-				if ((xs->flags & SCSI_SILENT) == 0) {
+				if ((xs->flags & SCSI_SILENT) == 0)
 					printf(
 					    "%s: bad residual %d out of %d\n",
 					    st->sc_dev.dv_xname, info,
 					    xs->datalen);
-					return (EIO);
-				}
+				return (EIO);
 			}
 			xs->resid = info;
 			if (bp)
-- 
cgit v1.2.3