Commit b3af7fdf authored by Mauro Matteo Cascella's avatar Mauro Matteo Cascella Committed by Paolo Bonzini
Browse files

hw/scsi/scsi-disk: MODE_PAGE_ALLS not allowed in MODE SELECT commands



This avoids an off-by-one read of 'mode_sense_valid' buffer in
hw/scsi/scsi-disk.c:mode_sense_page().

Fixes: CVE-2021-3930
Cc: qemu-stable@nongnu.org
Reported-by: Alexander Bulekov's avatarAlexander Bulekov <alxndr@bu.edu>
Fixes: a8f4bbe2 ("scsi-disk: store valid mode pages in a table")
Fixes: #546

Reported-by: Qiuhao Li's avatarQiuhao Li <Qiuhao.Li@outlook.com>
Signed-off-by: Mauro Matteo Cascella's avatarMauro Matteo Cascella <mcascell@redhat.com>
Signed-off-by: Paolo Bonzini's avatarPaolo Bonzini <pbonzini@redhat.com>
parent b04dc92e
......@@ -1087,6 +1087,7 @@ static int mode_sense_page(SCSIDiskState *s, int page, uint8_t **p_outbuf,
uint8_t *p = *p_outbuf + 2;
int length;
assert(page < ARRAY_SIZE(mode_sense_valid));
if ((mode_sense_valid[page] & (1 << s->qdev.type)) == 0) {
return -1;
}
......@@ -1428,6 +1429,11 @@ static int scsi_disk_check_mode_select(SCSIDiskState *s, int page,
return -1;
}
/* MODE_PAGE_ALLS is only valid for MODE SENSE commands */
if (page == MODE_PAGE_ALLS) {
return -1;
}
p = mode_current;
memset(mode_current, 0, inlen + 2);
len = mode_sense_page(s, page, &p, 0);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment