Patrick Williams | f1e5d69 | 2016-03-30 15:21:19 -0500 | [diff] [blame] | 1 | From 4ab0359a8ae182a7ac5c99609667273167703fab Mon Sep 17 00:00:00 2001 |
| 2 | From: Prasad J Pandit <pjp@fedoraproject.org> |
| 3 | Date: Mon, 11 Jan 2016 14:10:42 -0500 |
| 4 | Subject: [PATCH] ide: ahci: reset ncq object to unused on error |
| 5 | |
| 6 | When processing NCQ commands, AHCI device emulation prepares a |
| 7 | NCQ transfer object; To which an aio control block(aiocb) object |
| 8 | is assigned in 'execute_ncq_command'. In case, when the NCQ |
| 9 | command is invalid, the 'aiocb' object is not assigned, and NCQ |
| 10 | transfer object is left as 'used'. This leads to a use after |
| 11 | free kind of error in 'bdrv_aio_cancel_async' via 'ahci_reset_port'. |
| 12 | Reset NCQ transfer object to 'unused' to avoid it. |
| 13 | |
| 14 | [Maintainer edit: s/ACHI/AHCI/ in the commit message. --js] |
| 15 | |
| 16 | Reported-by: Qinghao Tang <luodalongde@gmail.com> |
| 17 | Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org> |
| 18 | Reviewed-by: John Snow <jsnow@redhat.com> |
| 19 | Message-id: 1452282511-4116-1-git-send-email-ppandit@redhat.com |
| 20 | Signed-off-by: John Snow <jsnow@redhat.com> |
| 21 | |
| 22 | Upstream-Status: Backport |
| 23 | |
| 24 | http://git.qemu.org/?p=qemu.git;a=commit;h=4ab0359a8ae182a7ac5c99609667273167703fab |
| 25 | |
| 26 | CVE: CVE-2016-1568 |
| 27 | [Yocto # 9013] |
| 28 | |
| 29 | Signed-off-by: Armin Kuster <akuster@mvista.com> |
| 30 | |
| 31 | --- |
| 32 | hw/ide/ahci.c | 1 + |
| 33 | 1 file changed, 1 insertion(+) |
| 34 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 35 | Index: qemu-2.5.0/hw/ide/ahci.c |
Patrick Williams | f1e5d69 | 2016-03-30 15:21:19 -0500 | [diff] [blame] | 36 | =================================================================== |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 37 | --- qemu-2.5.0.orig/hw/ide/ahci.c |
| 38 | +++ qemu-2.5.0/hw/ide/ahci.c |
| 39 | @@ -910,6 +910,7 @@ static void ncq_err(NCQTransferState *nc |
Patrick Williams | f1e5d69 | 2016-03-30 15:21:19 -0500 | [diff] [blame] | 40 | ide_state->error = ABRT_ERR; |
| 41 | ide_state->status = READY_STAT | ERR_STAT; |
| 42 | ncq_tfs->drive->port_regs.scr_err |= (1 << ncq_tfs->tag); |
| 43 | + ncq_tfs->used = 0; |
| 44 | } |
| 45 | |
| 46 | static void ncq_finish(NCQTransferState *ncq_tfs) |