aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Erenberg <merenber@uwaterloo.ca>2023-12-25 18:44:32 -0500
committerMichael Tokarev <mjt@tls.msk.ru>2024-01-05 22:28:54 +0300
commit2c5107e1b455d4a157124f021826ead4e04b4aea (patch)
tree7de693ac6a137dfab2f07a606874f58cf3618fb1
parent0c7ffc977195c1f71c8132eb5616827e589d4a0f (diff)
downloadqemu-2c5107e1b455d4a157124f021826ead4e04b4aea.zip
qemu-2c5107e1b455d4a157124f021826ead4e04b4aea.tar.gz
qemu-2c5107e1b455d4a157124f021826ead4e04b4aea.tar.bz2
edu: fix DMA range upper bound check
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>
-rw-r--r--hw/misc/edu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/misc/edu.c b/hw/misc/edu.c
index a1f8bc7..e64a246 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;
}