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 |
---|---|---|
channel-buffer.c | -rw-r--r-- | 7.1 KB |
channel-command.c | -rw-r--r-- | 11.2 KB |
channel-file.c | -rw-r--r-- | 7.0 KB |
channel-null.c | -rw-r--r-- | 5.9 KB |
channel-socket.c | -rw-r--r-- | 27.0 KB |
channel-tls.c | -rw-r--r-- | 14.5 KB |
channel-util.c | -rw-r--r-- | 2.0 KB |
channel-watch.c | -rw-r--r-- | 8.6 KB |
channel-websock.c | -rw-r--r-- | 42.3 KB |
channel.c | -rw-r--r-- | 21.2 KB |
dns-resolver.c | -rw-r--r-- | 8.0 KB |
meson.build | -rw-r--r-- | 301 bytes |
net-listener.c | -rw-r--r-- | 9.0 KB |
task.c | -rw-r--r-- | 5.7 KB |
trace-events | -rw-r--r-- | 5.4 KB |
trace.h | -rw-r--r-- | 28 bytes |
Computing file changes ...