]> git.ipfire.org Git - thirdparty/qemu.git/commit
scsi_target_send_command(): amend stable-1.6 port of the CVE-2013-4344 fix
authorLaszlo Ersek <lersek@redhat.com>
Sat, 2 Nov 2013 19:14:21 +0000 (20:14 +0100)
committerMichael Roth <mdroth@linux.vnet.ibm.com>
Mon, 9 Dec 2013 20:49:49 +0000 (14:49 -0600)
commit192d2f4cc7931668d4e4f10e882af3c097193c47
treea03e4072035e31d30eaca59415de7e1b39083023
parent9388fdb603e69d1c251f9bdfaac575ad3258583a
scsi_target_send_command(): amend stable-1.6 port of the CVE-2013-4344 fix

The originally suggested fix for CVE-2013-4344 introduced a regression in
scsi_target_send_command() / REQUEST_SENSE; the third argument passed to
scsi_device_get_sense() -- for the "len" parameter -- ignored the
possibility of the guest SCSI driver requesting truncated (or shorter than
full) sense data.

This could result in (r->len > req->cmd.xfer) on return, which is not
valid SCSI.

The problem was addressed in the second round, and the commit on the
master branch (84642435) is correct. However the stable-1.6 branch (the
v1.6.1 release) has the original, regressive fix (commit fdcbe7d5); let's
update it.

Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
hw/scsi/scsi-bus.c