Received: from [140.186.70.92] (port=55250 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ov8Mw-0000AC-63 for qemu-devel@nongnu.org; Mon, 13 Sep 2010 08:42:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Ov8Mu-0004K2-Ru for qemu-devel@nongnu.org; Mon, 13 Sep 2010 08:42:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:8869) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Ov8Mu-0004Jp-EM for qemu-devel@nongnu.org; Mon, 13 Sep 2010 08:42:44 -0400 From: Kevin Wolf Date: Mon, 13 Sep 2010 14:42:43 +0200 Message-Id: <1284381771-7333-6-git-send-email-kwolf@redhat.com> In-Reply-To: <1284381771-7333-1-git-send-email-kwolf@redhat.com> References: <1284381771-7333-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [STABLE 0.13][PATCH 05/13] scsi-disk: return CHECK CONDITION for unknown page codes in the MODE SENSE command List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Bernhard Kohl 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 Signed-off-by: Kevin Wolf (cherry picked from commit a9c17b2bf3639662fbdeb736289ebabfda9fa21a) --- hw/scsi-disk.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 2a107b1..70c7a08 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; -- 1.7.2.2