* [Qemu-devel] [PATCH v2] ide: ahci: reset ncq object to unused on error
@ 2016-01-08 19:48 P J P
2016-01-08 19:54 ` John Snow
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: P J P @ 2016-01-08 19:48 UTC (permalink / raw)
To: John Snow; +Cc: Qinghao Tang, qemu-devel, qemu-block, Prasad J Pandit
From: Prasad J Pandit <pjp@fedoraproject.org>
When processing NCQ commands, ACHI 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.
Reported-by: Qinghao Tang <luodalongde@gmail.com>
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
---
hw/ide/ahci.c | 1 +
1 file changed, 1 insertion(+)
Update as per review in
-> https://lists.gnu.org/archive/html/qemu-devel/2016-01/msg01175.html
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index dd1912e..17f1cbd 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -910,6 +910,7 @@ static void ncq_err(NCQTransferState *ncq_tfs)
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;
}
static void ncq_finish(NCQTransferState *ncq_tfs)
--
2.4.3
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [Qemu-devel] [PATCH v2] ide: ahci: reset ncq object to unused on error
2016-01-08 19:48 [Qemu-devel] [PATCH v2] ide: ahci: reset ncq object to unused on error P J P
@ 2016-01-08 19:54 ` John Snow
2016-01-08 20:07 ` John Snow
2016-01-11 15:00 ` [Qemu-devel] [Qemu-block] " Kevin Wolf
2 siblings, 0 replies; 7+ messages in thread
From: John Snow @ 2016-01-08 19:54 UTC (permalink / raw)
To: P J P; +Cc: Qinghao Tang, qemu-devel, qemu-block, Prasad J Pandit
On 01/08/2016 02:48 PM, P J P wrote:
> From: Prasad J Pandit <pjp@fedoraproject.org>
>
> When processing NCQ commands, ACHI 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.
>
> Reported-by: Qinghao Tang <luodalongde@gmail.com>
> Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
> ---
> hw/ide/ahci.c | 1 +
> 1 file changed, 1 insertion(+)
>
> Update as per review in
> -> https://lists.gnu.org/archive/html/qemu-devel/2016-01/msg01175.html
>
> diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
> index dd1912e..17f1cbd 100644
> --- a/hw/ide/ahci.c
> +++ b/hw/ide/ahci.c
> @@ -910,6 +910,7 @@ static void ncq_err(NCQTransferState *ncq_tfs)
> 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;
> }
>
> static void ncq_finish(NCQTransferState *ncq_tfs)
>
Reviewed-by: John Snow <jsnow@redhat.com>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH v2] ide: ahci: reset ncq object to unused on error
2016-01-08 19:48 [Qemu-devel] [PATCH v2] ide: ahci: reset ncq object to unused on error P J P
2016-01-08 19:54 ` John Snow
@ 2016-01-08 20:07 ` John Snow
2016-01-09 4:16 ` P J P
2016-01-11 15:00 ` [Qemu-devel] [Qemu-block] " Kevin Wolf
2 siblings, 1 reply; 7+ messages in thread
From: John Snow @ 2016-01-08 20:07 UTC (permalink / raw)
To: P J P; +Cc: Qinghao Tang, qemu-devel, qemu-block, Prasad J Pandit
On 01/08/2016 02:48 PM, P J P wrote:
> From: Prasad J Pandit <pjp@fedoraproject.org>
>
> When processing NCQ commands, ACHI 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.
>
> Reported-by: Qinghao Tang <luodalongde@gmail.com>
> Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
> ---
> hw/ide/ahci.c | 1 +
> 1 file changed, 1 insertion(+)
>
> Update as per review in
> -> https://lists.gnu.org/archive/html/qemu-devel/2016-01/msg01175.html
>
> diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
> index dd1912e..17f1cbd 100644
> --- a/hw/ide/ahci.c
> +++ b/hw/ide/ahci.c
> @@ -910,6 +910,7 @@ static void ncq_err(NCQTransferState *ncq_tfs)
> 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;
> }
>
> static void ncq_finish(NCQTransferState *ncq_tfs)
>
Thanks, applied to my IDE tree:
https://github.com/jnsnow/qemu/commits/ide
https://github.com/jnsnow/qemu.git
--js
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [Qemu-block] [PATCH v2] ide: ahci: reset ncq object to unused on error
2016-01-08 19:48 [Qemu-devel] [PATCH v2] ide: ahci: reset ncq object to unused on error P J P
2016-01-08 19:54 ` John Snow
2016-01-08 20:07 ` John Snow
@ 2016-01-11 15:00 ` Kevin Wolf
2016-01-11 16:28 ` John Snow
2 siblings, 1 reply; 7+ messages in thread
From: Kevin Wolf @ 2016-01-11 15:00 UTC (permalink / raw)
To: P J P; +Cc: Qinghao Tang, John Snow, qemu-devel, qemu-block, Prasad J Pandit
Am 08.01.2016 um 20:48 hat P J P geschrieben:
> From: Prasad J Pandit <pjp@fedoraproject.org>
>
> When processing NCQ commands, ACHI device emulation prepares a
s/ACHI/AHCI/
Can you still fix this in your tree, John?
Kevin
> 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.
>
> Reported-by: Qinghao Tang <luodalongde@gmail.com>
> Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [Qemu-block] [PATCH v2] ide: ahci: reset ncq object to unused on error
2016-01-11 15:00 ` [Qemu-devel] [Qemu-block] " Kevin Wolf
@ 2016-01-11 16:28 ` John Snow
2016-01-11 17:09 ` P J P
0 siblings, 1 reply; 7+ messages in thread
From: John Snow @ 2016-01-11 16:28 UTC (permalink / raw)
To: Kevin Wolf, P J P; +Cc: Qinghao Tang, qemu-devel, qemu-block, Prasad J Pandit
On 01/11/2016 10:00 AM, Kevin Wolf wrote:
> Am 08.01.2016 um 20:48 hat P J P geschrieben:
>> From: Prasad J Pandit <pjp@fedoraproject.org>
>>
>> When processing NCQ commands, ACHI device emulation prepares a
>
> s/ACHI/AHCI/
>
> Can you still fix this in your tree, John?
>
> Kevin
>
Yes, thanks.
>> 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.
>>
>> Reported-by: Qinghao Tang <luodalongde@gmail.com>
>> Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [Qemu-block] [PATCH v2] ide: ahci: reset ncq object to unused on error
2016-01-11 16:28 ` John Snow
@ 2016-01-11 17:09 ` P J P
0 siblings, 0 replies; 7+ messages in thread
From: P J P @ 2016-01-11 17:09 UTC (permalink / raw)
To: John Snow; +Cc: Kevin Wolf, Qinghao Tang, qemu-devel, qemu-block
+-- On Mon, 11 Jan 2016, John Snow wrote --+
| On 01/11/2016 10:00 AM, Kevin Wolf wrote:
| >> When processing NCQ commands, ACHI device emulation prepares a
| >
| > s/ACHI/AHCI/
Ah, sorry.:(
| > Can you still fix this in your tree, John?
| Yes, thanks.
Thank you.
--
Prasad J Pandit / Red Hat Product Security Team
47AF CE69 3A90 54AA 9045 1053 DD13 3D32 FE5B 041F
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2016-01-11 17:09 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-08 19:48 [Qemu-devel] [PATCH v2] ide: ahci: reset ncq object to unused on error P J P
2016-01-08 19:54 ` John Snow
2016-01-08 20:07 ` John Snow
2016-01-09 4:16 ` P J P
2016-01-11 15:00 ` [Qemu-devel] [Qemu-block] " Kevin Wolf
2016-01-11 16:28 ` John Snow
2016-01-11 17:09 ` P J P
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).