7a16948063
- ppc/xive: Fix ESB length overflow on 32-bit hosts - target/hppa: Fix PSW V-bit packaging in cpu_hppa_get for hppa64 - target/ppc: Fix migration of CPUs with TLB_EMB TLB type - target/arm: Clear high SVE elements in handle_vec_simd_wshli - module: Prevent crash by resetting local_err in module_load_qom_all() - tests/docker: update debian i686 and mipsel images to bookworm - target/arm: Fix SVE SDOT/UDOT/USDOT (4-way, indexed) - docs/sphinx/depfile.py: Handle env.doc2path() returning a Path not a str - block/blkio: use FUA flag on write zeroes only if supported - virtio-pci: Fix the use of an uninitialized irqfd - hw/cxl: Ensure there is enough data to read the input header in cmd_get_physical_port_state() - intel_iommu: Send IQE event when setting reserved bit in IQT_TAIL - virtio-net: Avoid indirection_table_mask overflow - Fix calculation of minimum in colo_compare_tcp - target/riscv/csr.c: Fix an access to VXSAT - linux-user: Clean up unused header - raw-format: Fix error message for invalid offset/size - hw/loongarch/virt: Remove unnecessary 'cpu.h' inclusion - tests: Wait for migration completion on destination QEMU to avoid failures - acpi: ged: Add macro for acpi sleep control register - hw/intc/openpic: Improve errors for out of bounds property values - hw/pci-bridge: Add a Kconfig switch for the normal PCI bridge - docs/tools/qemu-img.rst: fix typo (sumarizes) - audio/pw: Report more accurate error when connecting to PipeWire fails - audio/pw: Report more accurate error when connecting to PipeWire fails - dma: Fix function names in documentation Ensure the function names match. - edu: fix DMA range upper bound check - platform-bus: fix refcount leak - hw/net/can/sja1000: fix bug for single acceptance filter and standard frame - tests/avocado: fix typo in replay_linux - util/userfaultfd: Remove unused uffd_poll_events - Consider discard option when writing zeros - crypto: factor out conversion of QAPI to gcrypt constants - crypto: drop gnutls debug logging support - crypto: use consistent error reporting pattern for unsupported cipher modes - hw/gpio/aspeed_gpio: Avoid shift into sign bit Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit b6e04df301d30895427ab41a1edff0f40149bdd9)
48 lines
1.8 KiB
Diff
48 lines
1.8 KiB
Diff
From edf3b2b0a9b9aa992592951a979d1b4642026fe5 Mon Sep 17 00:00:00 2001
|
|
From: Zhang Jiao <zhangjiao2_yewu@cmss.chinamobile.com>
|
|
Date: Fri, 18 Oct 2024 09:12:50 +0800
|
|
Subject: [PATCH] edu: fix DMA range upper bound check
|
|
|
|
cheery-pick from 2c5107e1b455d4a157124f021826ead4e04b4aea
|
|
|
|
The edu_check_range function checks that start <= end1 < end2, where
|
|
end1 is the upper bound (exclusive) of the guest-supplied DMA range and
|
|
end2 is the upper bound (exclusive) of the device's allowed DMA range.
|
|
When the guest tries to transfer exactly DMA_SIZE (4096) bytes, end1
|
|
will be equal to end2, so the check fails and QEMU aborts with this
|
|
puzzling error message (newlines added for formatting):
|
|
|
|
qemu: hardware error: EDU: DMA range
|
|
0x0000000000040000-0x0000000000040fff out of bounds
|
|
(0x0000000000040000-0x0000000000040fff)!
|
|
|
|
By checking end1 <= end2 instead, guests will be allowed to transfer
|
|
exactly 4096 bytes. It is not necessary to explicitly check for
|
|
start <= end1 because the previous two checks (within(addr, start, end2)
|
|
and end1 > addr) imply start < end1.
|
|
|
|
Fixes: b30934cb52a7 ("hw: misc, add educational driver", 2015-01-21)
|
|
Signed-off-by: Max Erenberg <merenber@uwaterloo.ca>
|
|
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
|
|
Signed-off-by: Zhang Jiao <zhangjiao2_yewu@cmss.chinamobile.com>
|
|
---
|
|
hw/misc/edu.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/hw/misc/edu.c b/hw/misc/edu.c
|
|
index a1f8bc77e7..e64a246d3f 100644
|
|
--- a/hw/misc/edu.c
|
|
+++ b/hw/misc/edu.c
|
|
@@ -115,7 +115,7 @@ static void edu_check_range(uint64_t addr, uint64_t size1, uint64_t start,
|
|
uint64_t end2 = start + size2;
|
|
|
|
if (within(addr, start, end2) &&
|
|
- end1 > addr && within(end1, start, end2)) {
|
|
+ end1 > addr && end1 <= end2) {
|
|
return;
|
|
}
|
|
|
|
--
|
|
2.41.0.windows.1
|
|
|