mirror of https://gitlab.com/qemu-project/qemu
scsi: mptsas: infinite loop while fetching requests
The LSI SAS1068 Host Bus Adapter emulator in Qemu, periodically looks for requests and fetches them. A loop doing that in mptsas_fetch_requests() could run infinitely if 's->state' was not operational. Move check to avoid such a loop. Reported-by: Li Qiang <liqiang6-s@360.cn> Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org> Cc: qemu-stable@nongnu.org Message-Id: <1464077264-25473-1-git-send-email-ppandit@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
3e831b40e0
commit
06630554cc
|
@ -754,11 +754,6 @@ static void mptsas_fetch_request(MPTSASState *s)
|
||||||
hwaddr addr;
|
hwaddr addr;
|
||||||
int size;
|
int size;
|
||||||
|
|
||||||
if (s->state != MPI_IOC_STATE_OPERATIONAL) {
|
|
||||||
mptsas_set_fault(s, MPI_IOCSTATUS_INVALID_STATE);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Read the message header from the guest first. */
|
/* Read the message header from the guest first. */
|
||||||
addr = s->host_mfa_high_addr | MPTSAS_FIFO_GET(s, request_post);
|
addr = s->host_mfa_high_addr | MPTSAS_FIFO_GET(s, request_post);
|
||||||
pci_dma_read(pci, addr, req, sizeof(hdr));
|
pci_dma_read(pci, addr, req, sizeof(hdr));
|
||||||
|
@ -789,6 +784,10 @@ static void mptsas_fetch_requests(void *opaque)
|
||||||
{
|
{
|
||||||
MPTSASState *s = opaque;
|
MPTSASState *s = opaque;
|
||||||
|
|
||||||
|
if (s->state != MPI_IOC_STATE_OPERATIONAL) {
|
||||||
|
mptsas_set_fault(s, MPI_IOCSTATUS_INVALID_STATE);
|
||||||
|
return;
|
||||||
|
}
|
||||||
while (!MPTSAS_FIFO_EMPTY(s, request_post)) {
|
while (!MPTSAS_FIFO_EMPTY(s, request_post)) {
|
||||||
mptsas_fetch_request(s);
|
mptsas_fetch_request(s);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue