From 67266f35a56bf6166657e3fe6fdcfd4cb917a1ca Mon Sep 17 00:00:00 2001
From: Roland Dreier <roland@purestorage.com>
Date: Tue, 17 Jan 2012 18:00:57 -0800
Subject: [PATCH] --- yaml --- r: 287363 b: refs/heads/master c:
 bf0053550aebe56f3bb5dd793e9de69238b5b945 h: refs/heads/master i:   287361:
 8ad7f64175642f3a976cf604dc4f6e544502c4fd   287359:
 a5f9cfd2669741d71841863a3fb70a86e6811403 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/target/target_core_cdb.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 359701cefee5..8091e2847f7d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb1acb2ee038a6c13ee99e0b9fb44dacb4a9de84
+refs/heads/master: bf0053550aebe56f3bb5dd793e9de69238b5b945
diff --git a/trunk/drivers/target/target_core_cdb.c b/trunk/drivers/target/target_core_cdb.c
index 370ad13930a4..a9bbf5a5cc27 100644
--- a/trunk/drivers/target/target_core_cdb.c
+++ b/trunk/drivers/target/target_core_cdb.c
@@ -698,6 +698,13 @@ int target_emulate_inquiry(struct se_task *task)
 	int p, ret;
 
 	if (!(cdb[1] & 0x1)) {
+		if (cdb[2]) {
+			pr_err("INQUIRY with EVPD==0 but PAGE CODE=%02x\n",
+			       cdb[2]);
+			cmd->scsi_sense_reason = TCM_INVALID_CDB_FIELD;
+			return -EINVAL;
+		}
+
 		ret = target_emulate_inquiry_std(cmd);
 		goto out;
 	}