]> xenbits.xensource.com Git - qemu-upstream-4.3-testing.git/commitdiff
ide: ahci: reset ncq object to unused on error
authorPrasad J Pandit <pjp@fedoraproject.org>
Fri, 5 Feb 2016 13:58:20 +0000 (13:58 +0000)
committerStefano Stabellini <stefano.stabellini@eu.citrix.com>
Fri, 5 Feb 2016 14:47:09 +0000 (14:47 +0000)
When processing NCQ commands, AHCI device emulation prepares a
NCQ transfer object; To which an aio control block(aiocb) object
is assigned in 'execute_ncq_command'. In case, when the NCQ
command is invalid, the 'aiocb' object is not assigned, and NCQ
transfer object is left as 'used'. This leads to a use after
free kind of error in 'bdrv_aio_cancel_async' via 'ahci_reset_port'.
Reset NCQ transfer object to 'unused' to avoid it.

[Maintainer edit: s/ACHI/AHCI/ in the commit message. --js]

Reported-by: Qinghao Tang <luodalongde@gmail.com>
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-id: 1452282511-4116-1-git-send-email-ppandit@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
hw/ide/ahci.c

index 67562db041e3f8a9d4086e89e44829e0e78484f3..6a7e2fb98065c695c1e78d3f2a4606a3e250c71a 100644 (file)
@@ -722,6 +722,7 @@ static void ncq_cb(void *opaque, int ret)
         ide_state->error = ABRT_ERR;
         ide_state->status = READY_STAT | ERR_STAT;
         ncq_tfs->drive->port_regs.scr_err |= (1 << ncq_tfs->tag);
+        ncq_tfs->used = 0;
     } else {
         ide_state->status = READY_STAT | SEEK_STAT;
     }