From: Bernhard Kohl <bernhard.kohl@nsn.com>
Date: Tue, 31 Aug 2010 12:08:26 +0000 (+0200)
Subject: scsi-disk: return CHECK CONDITION for unknown page codes in the MODE SENSE command
X-Git-Tag: v0.13.0-rc3^2~8
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d65741acf42daffa422a2c3e77465df49e550d49;p=users%2Fdwmw2%2Fqemu.git

scsi-disk: return CHECK CONDITION for unknown page codes in the MODE SENSE command

SCSI-Spec:
http://ldkelley.com/SCSI2/SCSI2/SCSI2-08.html#8.2.10
"An initiator may request any one or all of the supported mode pages
from a target. If an initiator issues a MODE SENSE command with a
page code value not implemented by the target, the target shall return
CHECK CONDITION status and shall set the sense key to ILLEGAL REQUEST
and the additional sense code to INVALID FIELD IN CDB."

Signed-off-by: Bernhard Kohl <bernhard.kohl@nsn.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
(cherry picked from commit a9c17b2bf3639662fbdeb736289ebabfda9fa21a)
---

diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index 2a107b1bfd..70c7a08190 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -689,6 +689,8 @@ static int scsi_disk_emulate_mode_sense(SCSIRequest *req, uint8_t *outbuf)
         p += mode_sense_page(req, 0x08, p, page_control);
         p += mode_sense_page(req, 0x2a, p, page_control);
         break;
+    default:
+        return -1; /* ILLEGAL_REQUEST */
     }
 
     buflen = p - outbuf;