7bb77ea74f
- Introduce the SM4 cipher algorithms (OSCCA GB/T 32907-2016).
- intel_iommu: Add missed sanity check for 256-bit invalidation queue
- linux-user: use 'max' instead of 'qemu32' / 'qemu64' by default
- chardev/baum: Use definitions to avoid dynamic stack allocation
- ui/console: Get tab completion working again in the SDL monitor vc
- s390x/tcg: Fix opcode for lzrf
- virtiofsd: use g_date_time_get_microsecond to get subsecond
- ui/curses: Avoid dynamic stack allocation
- target/m68k: always call gen_exit_tb() after writes to SR
- target/m68k: Perform writback before modifying SR
- target/m68k: Fix MACSR to CCR
- target/m68k: Implement atomic test-and-set
- block/nvme: nvme_process_completion() fix bound for cid
- hw/pci-host: pnv_phb{3, 4}: Fix heap out-of-bound access failure
- target/ppc: Zero second doubleword of VSR registers for FPR insns
- target/ppc: Set OV32 when OV is set
- target/ppc: Zero second doubleword for VSX madd instructions
- target/ppc: Set result to QNaN for DENBCD when VXCVI occurs
- hw/pci: Add parenthesis to PCI_BUILD_BDF macro
- intel_iommu: Send IQE event when setting reserved bit in IQT_TAIL
- acpi: cpuhp: fix guest-visible maximum access size to the legacy reg block
- acpi: ged: Add macro for acpi sleep control register
- hw/pci-bridge: Add a Kconfig switch for the normal PCI bridge
- ui/vnc: fix handling of VNC_FEATURE_XVP
- s390/sclp: fix SCLP facility map
- docs/tools/qemu-img.rst: fix typo (sumarizes)
- chardev/char: fix qemu_chr_is_busy() check
- edu: fix DMA range upper bound check
- platform-bus: fix refcount leak
- hw/net/virtio-net: fix qemu set used ring flag even vhost started
- 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
- hw/core/ptimer: fix timer zero period condition for freq > 1GHz
- hcd-ohci: Drop ohci_service_iso_td() if ed->head & OHCI_DPTR_MASK is zero
- tests/unit/test-vmstate: Avoid dynamic stack allocation
- hw/usb/hcd-ohci: Use definition to avoid dynamic stack allocation
- hw/i386/multiboot: Avoid dynamic stack allocation
- hw/ppc/spapr: Fix code style problems reported by checkpatch
- chardev/baum: Replace magic values by X_MAX / Y_MAX definitions
- hw/intc/xics: Avoid dynamic stack allocation
- hw/net/e1000e_core: Use definition to avoid dynamic stack allocation
- intel_iommu: Fix invalidation descriptor type field
- configs: Fix typo in the sh4-softmmu devices config file
Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
(cherry picked from commit 9813ed21ec2499c50cb58ac5fb114a1641708eb2)
48 lines
1.8 KiB
Diff
48 lines
1.8 KiB
Diff
From 2773eb7848850e1e5099b255d84fb1da13fecd44 Mon Sep 17 00:00:00 2001
|
|
From: Zhang Jiao <zhangjiao2_yewu@cmss.chinamobile.com>
|
|
Date: Fri, 18 Oct 2024 09:07:39 +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 e935c418d4..a9f6421aa5 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
|
|
|