9803c6ed12
- hw/virtio/virtio-crypto: Protect from DMA re-entrancy bugs(CVE-2024-3446) - hw/char/virtio-serial-bus: Protect from DMA re-entrancy bugs(CVE-2024-3446) - hw/display/virtio-gpu: Protect from DMA re-entrancy bugs(CVE-2024-3446) - hw/virtio: Introduce virtio_bh_new_guarded() helper - hw: replace most qemu_bh_new calls with qemu_bh_new_guarded - checkpatch: add qemu_bh_new/aio_bh_new checks - async: avoid use-after-free on re-entrancy guard - async: Add an optional reentrancy guard to the BH API - hw/sd/sdhci: Do not update TRNMOD when Command Inhibit (DAT) is set(CVE-2024-3447) - rtl8139: Remove unused variable - tulip: Remove unused variable - virtio-mem: Fix the bitmap index of the section offset - virtio-mem: Fix the iterator variable in a vmem->rdl_list loop - system/memory: use ldn_he_p/stn_he_p - block: Fix crash when loading snapshot on inactive node - smmu: Clear SMMUPciBus pointer cache when system reset - block/mirror: Fix NULL s->job in active writes - amd_iommu: Fix APIC address check - virtio-crypto: fix NULL pointer dereference in virtio_crypto_free_reques - libqos/virtio.c: Correct 'flags' reading in qvirtqueue_kick cherry-pick from 66e411885a23c96ff73742d06b793fec3ceaebb7 - ivshmem-test.c: enable test_ivshmem_server for ppc64 arch - ivshmem.c: change endianness to LITTLE_ENDIAN - hw/ppc/mac.h: Remove MAX_CPUS macro - configure: remove dead variables - virtio-gpu: do not byteswap padding - hw/intc: clean-up error reporting for failed ITS cmd - qemu-iotests: Discard stderr when probing devices - linux-user: un-parent OBJECT(cpu) when closing thread - hw/net/rocker: Avoid undefined shifts with more than 31 ports - contrib/vhost-user-blk: Clean up deallocation of VuVirtqElement - scsi-disk: fix overflow when block size is not a multiple of BDRV_SECTOR_SIZE Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit bf54b48c2963c869dfdc89977c57be4bd9e772aa)
79 lines
2.6 KiB
Diff
79 lines
2.6 KiB
Diff
From 8a0a03a259eec5879a514363e3a80fea5039510f Mon Sep 17 00:00:00 2001
|
|
From: zhujun2 <zhujun2_yewu@cmss.chinamobile.com>
|
|
Date: Mon, 8 Apr 2024 01:09:55 -0700
|
|
Subject: [PATCH] system/memory: use ldn_he_p/stn_he_p
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Using direct pointer dereferencing can allow for unaligned accesses,
|
|
which was seen during execution with sanitizers enabled.
|
|
|
|
Cc: qemu-stable@nongnu.org
|
|
Reviewed-by: Chris Rauer <crauer@google.com>
|
|
Reviewed-by: Peter Foley <pefoley@google.com>
|
|
Signed-off-by: Patrick Venture <venture@google.com>
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>o
|
|
Reviewed-by: David Hildenbrand <david@redhat.com>
|
|
Message-ID: <20231116163633.276671-1-venture@google.com>
|
|
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>o
|
|
(cherry picked from commit 2b8fe81b3c2e76d241510a9a85496d544e42f5ec)
|
|
Signed-off-by: zhujun2 <zhujun2_yewu@cmss.chinamobile.com>
|
|
---
|
|
softmmu/memory.c | 32 ++------------------------------
|
|
1 file changed, 2 insertions(+), 30 deletions(-)
|
|
|
|
diff --git a/softmmu/memory.c b/softmmu/memory.c
|
|
index 102f0a4248..0bf37f11aa 100644
|
|
--- a/softmmu/memory.c
|
|
+++ b/softmmu/memory.c
|
|
@@ -1325,22 +1325,7 @@ static uint64_t memory_region_ram_device_read(void *opaque,
|
|
hwaddr addr, unsigned size)
|
|
{
|
|
MemoryRegion *mr = opaque;
|
|
- uint64_t data = (uint64_t)~0;
|
|
-
|
|
- switch (size) {
|
|
- case 1:
|
|
- data = *(uint8_t *)(mr->ram_block->host + addr);
|
|
- break;
|
|
- case 2:
|
|
- data = *(uint16_t *)(mr->ram_block->host + addr);
|
|
- break;
|
|
- case 4:
|
|
- data = *(uint32_t *)(mr->ram_block->host + addr);
|
|
- break;
|
|
- case 8:
|
|
- data = *(uint64_t *)(mr->ram_block->host + addr);
|
|
- break;
|
|
- }
|
|
+ uint64_t data = ldn_he_p(mr->ram_block->host + addr, size);
|
|
|
|
trace_memory_region_ram_device_read(get_cpu_index(), mr, addr, data, size);
|
|
|
|
@@ -1354,20 +1339,7 @@ static void memory_region_ram_device_write(void *opaque, hwaddr addr,
|
|
|
|
trace_memory_region_ram_device_write(get_cpu_index(), mr, addr, data, size);
|
|
|
|
- switch (size) {
|
|
- case 1:
|
|
- *(uint8_t *)(mr->ram_block->host + addr) = (uint8_t)data;
|
|
- break;
|
|
- case 2:
|
|
- *(uint16_t *)(mr->ram_block->host + addr) = (uint16_t)data;
|
|
- break;
|
|
- case 4:
|
|
- *(uint32_t *)(mr->ram_block->host + addr) = (uint32_t)data;
|
|
- break;
|
|
- case 8:
|
|
- *(uint64_t *)(mr->ram_block->host + addr) = data;
|
|
- break;
|
|
- }
|
|
+ stn_he_p(mr->ram_block->host + addr, size, data);
|
|
}
|
|
|
|
static const MemoryRegionOps ram_device_mem_ops = {
|
|
--
|
|
2.27.0
|
|
|