Revision 98f3488c1b6090024299f8d6362aa6aac03fe26d authored by Akihiko Odaki on 28 February 2024, 11:33:12 UTC, committed by Michael Tokarev on 13 March 2024, 18:52:34 UTC
nvme_sriov_pre_write_ctrl() used to directly inspect SR-IOV
configurations to know the number of VFs being disabled due to SR-IOV
configuration writes, but the logic was flawed and resulted in
out-of-bound memory access.
It assumed PCI_SRIOV_NUM_VF always has the number of currently enabled
VFs, but it actually doesn't in the following cases:
- PCI_SRIOV_NUM_VF has been set but PCI_SRIOV_CTRL_VFE has never been.
- PCI_SRIOV_NUM_VF was written after PCI_SRIOV_CTRL_VFE was set.
- VFs were only partially enabled because of realization failure.
It is a responsibility of pcie_sriov to interpret SR-IOV configurations
and pcie_sriov does it correctly, so use pcie_sriov_num_vfs(), which it
provides, to get the number of enabled VFs before and after SR-IOV
configuration writes.
Cc: qemu-stable@nongnu.org
Fixes: CVE-2024-26328
Fixes: 11871f53ef8e ("hw/nvme: Add support for the Virtualization Management command")
Suggested-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Message-Id: <20240228-reuse-v8-1-282660281e60@daynix.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
(cherry picked from commit 91bb64a8d2014fda33a81fcf0fce37340f0d3b0c)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
1 parent 3097bcb
| File | Mode | Size |
|---|---|---|
| alpha.c | -rw-r--r-- | 79.8 KB |
| capstone.c | -rw-r--r-- | 9.5 KB |
| cris.c | -rw-r--r-- | 80.0 KB |
| disas-internal.h | -rw-r--r-- | 440 bytes |
| disas-mon.c | -rw-r--r-- | 1.7 KB |
| disas.c | -rw-r--r-- | 9.3 KB |
| hexagon.c | -rw-r--r-- | 2.0 KB |
| hppa.c | -rw-r--r-- | 100.3 KB |
| m68k.c | -rw-r--r-- | 212.0 KB |
| meson.build | -rw-r--r-- | 1.0 KB |
| microblaze.c | -rw-r--r-- | 58.2 KB |
| mips.c | -rw-r--r-- | 268.2 KB |
| nanomips.c | -rw-r--r-- | 697.1 KB |
| nios2.c | -rw-r--r-- | 131.7 KB |
| riscv-xthead.c | -rw-r--r-- | 24.2 KB |
| riscv-xthead.h | -rw-r--r-- | 818 bytes |
| riscv-xventana.c | -rw-r--r-- | 1.0 KB |
| riscv-xventana.h | -rw-r--r-- | 379 bytes |
| riscv.c | -rw-r--r-- | 198.2 KB |
| riscv.h | -rw-r--r-- | 7.7 KB |
| sh4.c | -rw-r--r-- | 82.4 KB |
| sparc.c | -rw-r--r-- | 169.7 KB |
| xtensa.c | -rw-r--r-- | 5.0 KB |
Computing file changes ...
