diff --git a/CVE-2022-47022.patch b/CVE-2022-47022.patch deleted file mode 100644 index b75ce5434b78c1fff9247be1e2fa57a50ad03a17..0000000000000000000000000000000000000000 --- a/CVE-2022-47022.patch +++ /dev/null @@ -1,72 +0,0 @@ -From eec84f84d4c4a7af6ed2c57ba95a9256e56e73b4 Mon Sep 17 00:00:00 2001 -From: Brice Goglin -Date: Wed, 23 Aug 2023 19:52:47 +0200 -Subject: [PATCH] linux: handle glibc cpuset allocation failures - -Origin: https://github.com/open-mpi/hwloc/commit/eec84f84d4c4a7af6ed2c57ba95a9256e56e73b4 - -Closes #544 -CVE-2022-47022 - -Signed-off-by: Brice Goglin -(cherry picked from commit ac1f8db9a0790d2bf153711ff4cbf6101f89aace) ---- - hwloc/topology-linux.c | 15 ++++++++++++++- - 1 file changed, 14 insertions(+), 1 deletion(-) - -diff --git a/hwloc/topology-linux.c b/hwloc/topology-linux.c -index bfc5dc23f..cae4f84d1 100644 ---- a/hwloc/topology-linux.c -+++ b/hwloc/topology-linux.c -@@ -877,6 +877,8 @@ hwloc_linux_set_tid_cpubind(hwloc_topology_t topology __hwloc_attribute_unused, - - setsize = CPU_ALLOC_SIZE(last+1); - plinux_set = CPU_ALLOC(last+1); -+ if (!plinux_set) -+ return -1; - - CPU_ZERO_S(setsize, plinux_set); - hwloc_bitmap_foreach_begin(cpu, hwloc_set) -@@ -957,7 +959,10 @@ hwloc_linux_find_kernel_nr_cpus(hwloc_topology_t topology) - while (1) { - cpu_set_t *set = CPU_ALLOC(nr_cpus); - size_t setsize = CPU_ALLOC_SIZE(nr_cpus); -- int err = sched_getaffinity(0, setsize, set); /* always works, unless setsize is too small */ -+ int err; -+ if (!set) -+ return -1; /* caller will return an error, and we'll try again later */ -+ err = sched_getaffinity(0, setsize, set); /* always works, unless setsize is too small */ - CPU_FREE(set); - nr_cpus = setsize * 8; /* that's the value that was actually tested */ - if (!err) -@@ -985,8 +990,12 @@ hwloc_linux_get_tid_cpubind(hwloc_topology_t topology __hwloc_attribute_unused, - - /* find the kernel nr_cpus so as to use a large enough cpu_set size */ - kernel_nr_cpus = hwloc_linux_find_kernel_nr_cpus(topology); -+ if (kernel_nr_cpus < 0) -+ return -1; - setsize = CPU_ALLOC_SIZE(kernel_nr_cpus); - plinux_set = CPU_ALLOC(kernel_nr_cpus); -+ if (!plinux_set) -+ return -1; - - err = sched_getaffinity(tid, setsize, plinux_set); - -@@ -1340,6 +1349,8 @@ hwloc_linux_set_thread_cpubind(hwloc_topology_t topology, pthread_t tid, hwloc_c - - setsize = CPU_ALLOC_SIZE(last+1); - plinux_set = CPU_ALLOC(last+1); -+ if (!plinux_set) -+ return -1; - - CPU_ZERO_S(setsize, plinux_set); - hwloc_bitmap_foreach_begin(cpu, hwloc_set) -@@ -1431,6 +1442,8 @@ hwloc_linux_get_thread_cpubind(hwloc_topology_t topology, pthread_t tid, hwloc_b - - setsize = CPU_ALLOC_SIZE(last+1); - plinux_set = CPU_ALLOC(last+1); -+ if (!plinux_set) -+ return -1; - - err = pthread_getaffinity_np(tid, setsize, plinux_set); - if (err) { diff --git a/hwloc-2.9.1.tar.bz2 b/hwloc-2.10.0.tar.bz2 similarity index 40% rename from hwloc-2.9.1.tar.bz2 rename to hwloc-2.10.0.tar.bz2 index a71cfc5574351414dc2b9be0b31d91c78d880422..4b817f7344c995e87ffff269560af1d00e72b235 100644 Binary files a/hwloc-2.9.1.tar.bz2 and b/hwloc-2.10.0.tar.bz2 differ diff --git a/hwloc.spec b/hwloc.spec index 831ed7449e68e28e680b7461b7250efd8d099e44..83b11a3df90190e18b5e5da4ca034932e48a86ee 100644 --- a/hwloc.spec +++ b/hwloc.spec @@ -1,11 +1,10 @@ Name: hwloc -Version: 2.9.1 -Release: 2 +Version: 2.10.0 +Release: 1 Summary: Hardware locality utilities and libraries License: BSD-3-Clause URL: https://www.open-mpi.org/projects/hwloc/ Source0: https://download.open-mpi.org/release/%{name}/v2.9/%{name}-%{version}.tar.bz2 -Patch0: CVE-2022-47022.patch BuildRequires: gcc-c++ cairo-devel libpciaccess-devel libtool-ltdl-devel libX11-devel libxml2-devel texlive-latex BuildRequires: desktop-file-utils systemd texlive-makeindex ncurses-devel transfig doxygen @@ -112,6 +111,9 @@ LD_LIBRARY_PATH=$PWD/hwloc/.libs make check %{_pkgdocdir}/*[^c] %changelog +* Mon Mar 18 2024 xu_ping <707078654@qq.com> - 2.10.0-1 +- Upgrade version to 2.10.0 + * Wed Aug 30 2023 wangkai <13474090681@163.com> - 2.9.1-2 - Fix CVE-2022-47022