Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-15-SP3:Update
qemu.29315
hw-nvme-fix-CVE-2021-3929.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File hw-nvme-fix-CVE-2021-3929.patch of Package qemu.29315
From: Li Zhang <lizhang@suse.de> Date: Fri, 7 Oct 2022 13:24:19 +0200 Subject: hw/nvme: fix CVE-2021-3929 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Git-commit: 736b01642d85be832385063f278fe7cd4ffb5221 References: bsc#1193880,CVE-2021-3929 This fixes CVE-2021-3929 "locally" by denying DMA to the iomem of the device itself. This still allows DMA to MMIO regions of other devices (e.g. doing P2P DMA to the controller memory buffer of another NVMe device). Fixes: CVE-2021-3929 Reported-by: Qiuhao Li <Qiuhao.Li@outlook.com> Reviewed-by: Keith Busch <kbusch@kernel.org> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Signed-off-by: Klaus Jensen <k.jensen@samsung.com> Signed-off-by: Li Zhang <lizhang@suse.de> Signed-off-by: Lin Ma <lma@suse.com> --- hw/block/nvme.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 01b657b1c5e27fad73627834e1d0..d68c736b25adad84928c8a685fbd 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -142,6 +142,24 @@ static inline void *nvme_addr_to_cmb(NvmeCtrl *n, hwaddr addr) return &n->cmbuf[addr - n->ctrl_mem.addr]; } +static inline bool nvme_addr_is_iomem(NvmeCtrl *n, hwaddr addr) +{ + PCIDevice *pci_dev = &n->parent_obj; + hwaddr regs_hi, regs_lo, msix_hi, msix_lo; + + /* + * The purpose of this check is to guard against invalid "local" access + * to the iomem (i.e. controller registers, MSIX-related space). + */ + regs_lo = n->iomem.addr; + regs_hi = regs_lo + int128_get64(n->iomem.size); + msix_lo = pci_dev->msix_exclusive_bar.addr; + msix_hi = msix_lo + int128_get64(pci_dev->msix_exclusive_bar.size); + + return (addr >= regs_lo && addr < regs_hi) || + (addr >= msix_lo && addr < msix_hi); +} + static int nvme_addr_read(NvmeCtrl *n, hwaddr addr, void *buf, int size) { hwaddr hi = addr + size - 1; @@ -283,6 +301,10 @@ static uint16_t nvme_map_addr(NvmeCtrl *n, QEMUSGList *qsg, QEMUIOVector *iov, trace_pci_nvme_map_addr(addr, len); + if (nvme_addr_is_iomem(n, addr)) { + return NVME_DATA_TRAS_ERROR; + } + if (nvme_addr_is_cmb(n, addr)) { if (qsg && qsg->sg) { return NVME_INVALID_USE_OF_CMB | NVME_DNR;
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor