diff --git a/libvirt.spec b/libvirt.spec index 21f354bfe5068d50fe9bd4d86d48eb741691e00b..6480ef6e1d02f16da5df905bd201696462c7a2b8 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -101,7 +101,7 @@ Summary: Library providing a simple virtualization API Name: libvirt Version: 6.2.0 -Release: 14 +Release: 15 License: LGPLv2+ URL: https://libvirt.org/ @@ -147,6 +147,7 @@ Patch0034: cpu_map-Add-pschange-mc-no-bit-in-IA32_ARCH_CAPABILI.patch Patch0035: cpu_map-Distribute-x86_Cooperlake.xml.patch Patch0036: storage_driver-Unlock-object-on-ACL-fail-in-storageP.patch Patch0037: security-fix-SELinux-label-generation-logic.patch +Patch0038: nwfilter-fix-crash-when-counting-number-of-network-f.patch Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon-config-network = %{version}-%{release} @@ -1881,6 +1882,9 @@ exit 0 %changelog +* Mon Jun 20 2022 yezengruan +- nwfilter: fix crash when counting number of network filters (CVE-2022-0897) + * Wed Jun 15 2022 yezengruan - libvir.spec: build without dtrace diff --git a/nwfilter-fix-crash-when-counting-number-of-network-f.patch b/nwfilter-fix-crash-when-counting-number-of-network-f.patch new file mode 100644 index 0000000000000000000000000000000000000000..94118c3245f244f2ff87f0be3cb1c7af844c69ab --- /dev/null +++ b/nwfilter-fix-crash-when-counting-number-of-network-f.patch @@ -0,0 +1,54 @@ +From ce22d527e06412c669fa46ba48bc5e6f8f647772 Mon Sep 17 00:00:00 2001 +From: AlexChen +Date: Tue, 8 Mar 2022 17:28:38 +0000 +Subject: [PATCH] nwfilter: fix crash when counting number of network filters +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The virNWFilterObjListNumOfNWFilters method iterates over the +driver->nwfilters, accessing virNWFilterObj instances. As such +it needs to be protected against concurrent modification of +the driver->nwfilters object. + +This API allows unprivileged users to connect, so users with +read-only access to libvirt can cause a denial of service +crash if they are able to race with a call of virNWFilterUndefine. +Since network filters are usually statically defined, this is +considered a low severity problem. + +This is assigned CVE-2022-0897. + +Reviewed-by: Eric Blake +Signed-off-by: Daniel P. Berrangé +cherry-picked from a4947e8f63c3e6 +Signed-off-by: AlexChen +--- + src/nwfilter/nwfilter_driver.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c +index 1c407727db..27500d192a 100644 +--- a/src/nwfilter/nwfilter_driver.c ++++ b/src/nwfilter/nwfilter_driver.c +@@ -514,11 +514,15 @@ nwfilterLookupByName(virConnectPtr conn, + static int + nwfilterConnectNumOfNWFilters(virConnectPtr conn) + { ++ int ret; + if (virConnectNumOfNWFiltersEnsureACL(conn) < 0) + return -1; + +- return virNWFilterObjListNumOfNWFilters(driver->nwfilters, conn, +- virConnectNumOfNWFiltersCheckACL); ++ nwfilterDriverLock(); ++ ret = virNWFilterObjListNumOfNWFilters(driver->nwfilters, conn, ++ virConnectNumOfNWFiltersCheckACL); ++ nwfilterDriverUnlock(); ++ return ret; + } + + +-- +2.27.0 +