diff --git a/hw-ide-check-null-block-before-_cancel_dma_sync.patch b/hw-ide-check-null-block-before-_cancel_dma_sync.patch new file mode 100644 index 0000000000000000000000000000000000000000..1ff20a9683ec88de3d3a67086ffc82eedff9697e --- /dev/null +++ b/hw-ide-check-null-block-before-_cancel_dma_sync.patch @@ -0,0 +1,64 @@ +From 3b23698e240bd0efe987cf113e3bc8d233991d21 Mon Sep 17 00:00:00 2001 +From: Prasad J Pandit +Date: Wed, 14 Oct 2020 15:57:18 +0800 +Subject: [PATCH] hw/ide: check null block before _cancel_dma_sync + +fix CVE-2020-25743 + +patch link: https://lists.nongnu.org/archive/html/qemu-devel/2020-09/msg05967.html + +When canceling an i/o operation via ide_cancel_dam_sync(), +a block pointer may be null. Add check to avoid null pointer +dereference. + + -> https://ruhr-uni-bochum.sciebo.de/s/NNWP2GfwzYKeKwE?path=%2Fide_nullptr1 + ==1803100==Hint: address points to the zero page. + #0 blk_bs ../block/block-backend.c:714 + #1 blk_drain ../block/block-backend.c:1715 + #2 ide_cancel_dma_sync ../hw/ide/core.c:723 + #3 bmdma_cmd_writeb ../hw/ide/core.c:723 + #4 bmdma_write ../hw/ide/pci.c:298 + #5 memory_region_write_accessor ../softmmu/memory.c:483 + #6 access_with_adjusted_size ../softmmu/memory.c:544 + #7 memory_region_dispatch_write ../softmmu/memory.c:1465 + #8 flatview_write_continue ../exe.c:3176 + ... + +Reported-by: Ruhr-University +Signed-off-by: Prasad J Pandit +--- + hw/ide/core.c | 1 + + hw/ide/pci.c | 5 ++++- + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/hw/ide/core.c b/hw/ide/core.c +index f76f7e5234..8105187f49 100644 +--- a/hw/ide/core.c ++++ b/hw/ide/core.c +@@ -718,6 +718,7 @@ void ide_cancel_dma_sync(IDEState *s) + * whole DMA operation will be submitted to disk with a single + * aio operation with preadv/pwritev. + */ ++ assert(s->blk); + if (s->bus->dma->aiocb) { + trace_ide_cancel_dma_sync_remaining(); + blk_drain(s->blk); +diff --git a/hw/ide/pci.c b/hw/ide/pci.c +index b50091b615..b47e675456 100644 +--- a/hw/ide/pci.c ++++ b/hw/ide/pci.c +@@ -295,7 +295,10 @@ void bmdma_cmd_writeb(BMDMAState *bm, uint32_t val) + /* Ignore writes to SSBM if it keeps the old value */ + if ((val & BM_CMD_START) != (bm->cmd & BM_CMD_START)) { + if (!(val & BM_CMD_START)) { +- ide_cancel_dma_sync(idebus_active_if(bm->bus)); ++ IDEState *s = idebus_active_if(bm->bus); ++ if (s->blk) { ++ ide_cancel_dma_sync(s); ++ } + bm->status &= ~BM_STATUS_DMAING; + } else { + bm->cur_addr = bm->addr; +-- +2.23.0 + diff --git a/pci-check-bus-pointer-before-dereference.patch b/pci-check-bus-pointer-before-dereference.patch new file mode 100644 index 0000000000000000000000000000000000000000..540caaf945f28b4e13e53a299495528cb0703b5d --- /dev/null +++ b/pci-check-bus-pointer-before-dereference.patch @@ -0,0 +1,50 @@ +From e393095e6d1456e2fb22f3cde3a9f0a307152562 Mon Sep 17 00:00:00 2001 +From: Prasad J Pandit +Date: Wed, 14 Oct 2020 15:00:20 +0800 +Subject: [PATCH] pci: check bus pointer before dereference + +fix CVE-2020-25742 + +patch link: https://lists.nongnu.org/archive/html/qemu-devel/2020-09/msg05294.html + +While mapping IRQ level in pci_change_irq_level() routine, +it does not check if pci_get_bus() returned a valid pointer. +It may lead to a NULL pointer dereference issue. Add check to +avoid it. + + -> https://ruhr-uni-bochum.sciebo.de/s/NNWP2GfwzYKeKwE?path=%2Flsi_nullptr1 + ==1183858==Hint: address points to the zero page. + #0 pci_change_irq_level hw/pci/pci.c:259 + #1 pci_irq_handler hw/pci/pci.c:1445 + #2 pci_set_irq hw/pci/pci.c:1463 + #3 lsi_set_irq hw/scsi/lsi53c895a.c:488 + #4 lsi_update_irq hw/scsi/lsi53c895a.c:523 + #5 lsi_script_scsi_interrupt hw/scsi/lsi53c895a.c:554 + #6 lsi_execute_script hw/scsi/lsi53c895a.c:1149 + #7 lsi_reg_writeb hw/scsi/lsi53c895a.c:1984 + #8 lsi_io_write hw/scsi/lsi53c895a.c:2146 + ... + +Reported-by: Ruhr-University +Signed-off-by: Prasad J Pandit +--- + hw/pci/pci.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/hw/pci/pci.c b/hw/pci/pci.c +index de0fae10ab..df5a2c3294 100644 +--- a/hw/pci/pci.c ++++ b/hw/pci/pci.c +@@ -253,6 +253,9 @@ static void pci_change_irq_level(PCIDevice *pci_dev, int irq_num, int change) + PCIBus *bus; + for (;;) { + bus = pci_get_bus(pci_dev); ++ if (!bus) { ++ return; ++ } + irq_num = bus->map_irq(pci_dev, irq_num); + if (bus->set_irq) + break; +-- +2.23.0 + diff --git a/qemu.spec b/qemu.spec index e71a6d6e7ebd386fe110b5c9688287c174c689f2..6371fd0d490d1048c201c6c16c65e39cb685521c 100644 --- a/qemu.spec +++ b/qemu.spec @@ -1,6 +1,6 @@ Name: qemu Version: 4.1.0 -Release: 26 +Release: 27 Epoch: 2 Summary: QEMU is a generic and open source machine emulator and virtualizer License: GPLv2 and BSD and MIT and CC-BY @@ -238,6 +238,8 @@ Patch0225: sm501-Shorten-long-variable-names-in-sm501_2d_operat.patch Patch0226: sm501-Use-BIT-x-macro-to-shorten-constant.patch Patch0227: sm501-Clean-up-local-variables-in-sm501_2d_operation.patch Patch0228: sm501-Replace-hand-written-implementation-with-pixma.patch +Patch0229: pci-check-bus-pointer-before-dereference.patch +Patch0230: hw-ide-check-null-block-before-_cancel_dma_sync.patch BuildRequires: flex BuildRequires: bison @@ -584,6 +586,10 @@ getent passwd qemu >/dev/null || \ %endif %changelog +* Wed Oct 14 2020 Prasad J Pandit +- pci: check bus pointer before dereference +- hw/ide: check null block before _cancel_dma_sync + * Mon Sep 28 2020 Huawei Technologies Co., Ltd - sm501: Replace hand written implementation with pixman where possible - sm501: Clean up local variables in sm501_2d_operation