From 49de7581f4f9133bb9ab758bf136fa02fbcd3815 Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Thu, 22 Jun 2023 15:24:47 +0000 Subject: [PATCH] import OL libvirt-9.0.0-10.2.0.1.el9_2 --- ...in-virPCIVirtualFunctionList-cleanup.patch | 56 +++++++++++++++++++ SPECS/libvirt.spec | 12 +++- 2 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 SOURCES/libvirt-virpci-Resolve-leak-in-virPCIVirtualFunctionList-cleanup.patch diff --git a/SOURCES/libvirt-virpci-Resolve-leak-in-virPCIVirtualFunctionList-cleanup.patch b/SOURCES/libvirt-virpci-Resolve-leak-in-virPCIVirtualFunctionList-cleanup.patch new file mode 100644 index 0000000..1fe77ce --- /dev/null +++ b/SOURCES/libvirt-virpci-Resolve-leak-in-virPCIVirtualFunctionList-cleanup.patch @@ -0,0 +1,56 @@ +From 1f927f75a8a7d01cabdd88e595b67044098c2890 Mon Sep 17 00:00:00 2001 +Message-Id: <1f927f75a8a7d01cabdd88e595b67044098c2890@dist-git> +From: Tim Shearer +Date: Mon, 1 May 2023 13:15:48 +0000 +Subject: [PATCH] virpci: Resolve leak in virPCIVirtualFunctionList cleanup +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Repeatedly querying an SR-IOV PCI device's capabilities exposes a +memory leak caused by a failure to free the virPCIVirtualFunction +array within the parent struct's g_autoptr cleanup. + +Valgrind output after getting a single interface's XML description +1000 times: + +==325982== 256,000 bytes in 1,000 blocks are definitely lost in loss record 2,634 of 2,635 +==325982== at 0x4C3C096: realloc (vg_replace_malloc.c:1437) +==325982== by 0x59D952D: g_realloc (in /usr/lib64/libglib-2.0.so.0.5600.4) +==325982== by 0x4EE1F52: virReallocN (viralloc.c:52) +==325982== by 0x4EE1FB7: virExpandN (viralloc.c:78) +==325982== by 0x4EE219A: virInsertElementInternal (viralloc.c:183) +==325982== by 0x4EE23B2: virAppendElement (viralloc.c:288) +==325982== by 0x4F65D85: virPCIGetVirtualFunctionsFull (virpci.c:2389) +==325982== by 0x4F65753: virPCIGetVirtualFunctions (virpci.c:2256) +==325982== by 0x505CB75: virNodeDeviceGetPCISRIOVCaps (node_device_conf.c:2969) +==325982== by 0x505D181: virNodeDeviceGetPCIDynamicCaps (node_device_conf.c:3099) +==325982== by 0x505BC4E: virNodeDeviceUpdateCaps (node_device_conf.c:2677) +==325982== by 0x260FCBB2: nodeDeviceGetXMLDesc (node_device_driver.c:355) + +Signed-off-by: Tim Shearer +Reviewed-by: Ján Tomko +(cherry picked from commit 6425a311b8ad19d6f9c0b315bf1d722551ea3585) + +https://bugzilla.redhat.com/show_bug.cgi?id=2208596 +https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2023-2700 + +Signed-off-by: Ján Tomko +--- + src/util/virpci.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/util/virpci.c b/src/util/virpci.c +index 7800966963..a44f70fb08 100644 +--- a/src/util/virpci.c ++++ b/src/util/virpci.c +@@ -2253,6 +2253,7 @@ virPCIVirtualFunctionListFree(virPCIVirtualFunctionList *list) + g_free(list->functions[i].ifname); + } + ++ g_free(list->functions); + g_free(list); + } + +-- +2.40.1 diff --git a/SPECS/libvirt.spec b/SPECS/libvirt.spec index fd79e48..3cd4576 100644 --- a/SPECS/libvirt.spec +++ b/SPECS/libvirt.spec @@ -229,7 +229,7 @@ Summary: Library providing a simple virtualization API Name: libvirt Version: 9.0.0 -Release: 10.1%{?dist}%{?extra_release} +Release: 10.2.0.1%{?dist}%{?extra_release} License: LGPLv2+ URL: https://libvirt.org/ @@ -305,6 +305,7 @@ Patch64: libvirt-qemu-Add-nodemask-argument-to-qemuBuildThreadContextProps.patch Patch65: libvirt-qemuBuildThreadContextProps-Prune-.node-affinity-wrt-emulatorpin.patch Patch66: libvirt-docs-Document-memory-allocation-and-emulator-pinning-limitation.patch Patch67: libvirt-conf-Fix-migration-in-some-firmware-autoselection-scenarios.patch +Patch68: libvirt-virpci-Resolve-leak-in-virPCIVirtualFunctionList-cleanup.patch Requires: libvirt-daemon = %{version}-%{release} @@ -1211,7 +1212,8 @@ exit 1 %define arg_packager_version -Dpackager_version="%{release}" %define arg_selinux_mount -Dselinux_mount="/sys/fs/selinux" -# place macros above and build commands below this comment +# Set SOURCE_DATE_EPOCH from changelog +%define source_date_epoch_from_changelog 1 export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/libvirt.spec) @@ -2398,6 +2400,12 @@ exit 0 %endif %changelog +* Wed Jun 21 2023 EL Errata - 9.0.0-10.2.0.1 +- Set SOURCE_DATE_EPOCH from changelog [Orabug: 32019554] + +* Mon May 29 2023 Jiri Denemark - 9.0.0-10.2.el9_2 +- virpci: Resolve leak in virPCIVirtualFunctionList cleanup (CVE-2023-2700, rhbz#2208596) + * Fri Apr 14 2023 Jiri Denemark - 9.0.0-10.1.el9_2 - virnuma: Move virNumaNodesetToCPUset() out of WITH_NUMACTL (rhbz#2185039) - virnuma: Introduce virNumaCPUSetToNodeset() (rhbz#2185039)