OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

scsi-disk: reject ANCHOR=1 for UNMAP and WRITE SAME commands

Browse Source 
Since we report ANC_SUP==0 in VPD page B2h, we need to return
an error (ILLEGAL REQUEST/INVALID FIELD IN CDB) for all WRITE SAME
requests with ANCHOR==1.

Inspired by a similar patch to the LIO in-kernel target.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Paolo Bonzini 2013-11-22 13:40:00 +01:00 committed by Stefan Hajnoczi
parent c5fd1fb038
commit 823bd7391c
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/scsi/scsi-disk.c
View File

@ -1548,6 +1548,11 @@ static void scsi_disk_emulate_unmap(SCSIDiskReq *r, uint8_t *inbuf)
int len = r->req.cmd.xfer; int len = r->req.cmd.xfer;
UnmapCBData *data; UnmapCBData *data;
/* Reject ANCHOR=1. */
if (r->req.cmd.buf[1] & 0x1) {
goto invalid_field;
}
if (len < 8) { if (len < 8) {
goto invalid_param_len; goto invalid_param_len;
} }
@ -1578,6 +1583,10 @@ static void scsi_disk_emulate_unmap(SCSIDiskReq *r, uint8_t *inbuf)
invalid_param_len: invalid_param_len:
scsi_check_condition(r, SENSE_CODE(INVALID_PARAM_LEN)); scsi_check_condition(r, SENSE_CODE(INVALID_PARAM_LEN));
return;
invalid_field:
scsi_check_condition(r, SENSE_CODE(INVALID_FIELD));
} }
static void scsi_disk_emulate_write_data(SCSIRequest *req) static void scsi_disk_emulate_write_data(SCSIRequest *req)
@ -1856,8 +1865,9 @@ static int32_t scsi_disk_emulate_command(SCSIRequest *req, uint8_t *buf)
/* /*
* We only support WRITE SAME with the unmap bit set for now. * We only support WRITE SAME with the unmap bit set for now.
* Reject UNMAP=0 or ANCHOR=1.
*/ */
if (!(req->cmd.buf[1] & 0x8)) { if (!(req->cmd.buf[1] & 0x8) || (req->cmd.buf[1] & 0x10)) {
goto illegal_request; goto illegal_request;
} }