From f50959d72d2f5ef4f896b9c68b1cf98f8abc5d03 Mon Sep 17 00:00:00 2001
From: Daniel Markstedt <daniel@mindani.net>
Date: Tue, 9 Apr 2024 09:31:38 +0900
Subject: [PATCH] Revert "Multiple fixes for ModeSelect (#1405)"

This reverts commit ad5eae93e7f721817c95a01285babdb97ed940b8.
---
 cpp/devices/scsi_command_util.cpp   |  9 ++-------
 cpp/test/scsi_command_util_test.cpp | 27 +++------------------------
 2 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/cpp/devices/scsi_command_util.cpp b/cpp/devices/scsi_command_util.cpp
index 5c6068a7..20bb83f7 100644
--- a/cpp/devices/scsi_command_util.cpp
+++ b/cpp/devices/scsi_command_util.cpp
@@ -40,8 +40,7 @@ string scsi_command_util::ModeSelect(scsi_command cmd, cdb_t cdb, span<const uin
 	}
 	length -= offset;
 
-	// treat zero length as valid
-	bool has_valid_page_code = (length == 0);
+	bool has_valid_page_code = false;
 
 	// Parse the pages
 	while (length > 0) {
@@ -63,10 +62,6 @@ string scsi_command_util::ModeSelect(scsi_command cmd, cdb_t cdb, span<const uin
 
 			has_valid_page_code = true;
 		}
-		else if (page == 0x01) {
-			// OpenVMS Alpha 7.3 uses this
-			has_valid_page_code = true;
-		}
 		else {
 			stringstream s;
 			s << "Unknown MODE SELECT page code: $" << setfill('0') << setw(2) << hex << page;
@@ -76,7 +71,7 @@ string scsi_command_util::ModeSelect(scsi_command cmd, cdb_t cdb, span<const uin
 		// Advance to the next page
 		const int size = buf[offset + 1] + 2;
 
-		length -= size + 1;
+		length -= size;
 		offset += size;
 	}
 
diff --git a/cpp/test/scsi_command_util_test.cpp b/cpp/test/scsi_command_util_test.cpp
index 7bf81550..20afa389 100644
--- a/cpp/test/scsi_command_util_test.cpp
+++ b/cpp/test/scsi_command_util_test.cpp
@@ -46,11 +46,6 @@ TEST(ScsiCommandUtilTest, ModeSelect6)
 			Property(&scsi_exception::get_asc, asc::invalid_field_in_parameter_list))))
 		<< "Unsupported page 0 was not rejected";
 
-	// Page 1
-	buf[12] = 0x01;
-	EXPECT_NO_THROW(ModeSelect(scsi_command::eCmdModeSelect6, cdb, buf, LENGTH, 512))
-		<< "Page 1 is supported";
-
 	// Page 3 (Format Device Page)
 	buf[12] = 0x03;
 	EXPECT_THAT([&] { ModeSelect(scsi_command::eCmdModeSelect6, cdb, buf, LENGTH, 512); },
@@ -67,25 +62,7 @@ TEST(ScsiCommandUtilTest, ModeSelect6)
 			Property(&scsi_exception::get_asc, asc::invalid_field_in_parameter_list))))
 		<< "Not enough command parameters";
 
-	// check length computation
-	buf[3] = 8;
-	buf[10] = 2;
-	buf[12] = 1;
-	buf[13] = 10;
-	buf[14] = 0x24;
-	buf[24] = 0;
-	EXPECT_NO_THROW(ModeSelect(scsi_command::eCmdModeSelect6, cdb, buf, LENGTH, 512))
-		<< "Multi-page length computation";
-
-	// check length computation
-	buf[3] = 8;
-	buf[10] = 12;
-	buf[12] = 0;
-	buf[13] = 0;
-	buf[14] = 0;
-	buf[24] = 0;
-	EXPECT_NO_THROW(ModeSelect(scsi_command::eCmdModeSelect6, cdb, buf, 12, 512))
-		<< "Empty ModeSelect6";
+	EXPECT_FALSE(ModeSelect(scsi_command::eCmdModeSelect6, cdb, buf, LENGTH, 512).empty());
 }
 
 TEST(ScsiCommandUtilTest, ModeSelect10)
@@ -134,6 +111,8 @@ TEST(ScsiCommandUtilTest, ModeSelect10)
 			Property(&scsi_exception::get_sense_key, sense_key::illegal_request),
 			Property(&scsi_exception::get_asc, asc::invalid_field_in_parameter_list))))
 		<< "Not enough command parameters";
+
+	EXPECT_FALSE(ModeSelect(scsi_command::eCmdModeSelect10, cdb, buf, LENGTH, 512).empty());
 }
 
 TEST(ScsiCommandUtilTest, EnrichFormatPage)