[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH] ide: check BlockBackend object in ide_cancel_dma_sy
From: |
P J P |
Subject: |
[Qemu-block] [PATCH] ide: check BlockBackend object in ide_cancel_dma_sync |
Date: |
Fri, 14 Jul 2017 15:30:29 +0530 |
From: Prasad J Pandit <address@hidden>
When cancelling pending DMA requests in ide_cancel_dma_sync,
the s->blk object could be null, leading to a null dereference.
Add check to avoid it.
Reported-by: Chensongnian <address@hidden>
Signed-off-by: Prasad J Pandit <address@hidden>
---
hw/ide/core.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/hw/ide/core.c b/hw/ide/core.c
index 0b48b64..04474b3 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -681,8 +681,10 @@ void ide_cancel_dma_sync(IDEState *s)
#ifdef DEBUG_IDE
printf("%s: draining all remaining requests", __func__);
#endif
- blk_drain(s->blk);
- assert(s->bus->dma->aiocb == NULL);
+ if (s->blk) {
+ blk_drain(s->blk);
+ assert(s->bus->dma->aiocb == NULL);
+ }
}
}
--
2.9.4
- [Qemu-block] [PATCH] ide: check BlockBackend object in ide_cancel_dma_sync,
P J P <=