---

yaml --- r: 287363 b: refs/heads/master c: bf00535 h: refs/heads/master i: 287361: 8ad7f64 287359: a5f9cfd v: v3
git-mirror · Jan 18, 2012 · 67266f3 · 67266f3
1 parent 07df3d4
commit 67266f3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git 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
@@ -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;
 	}