Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Medium] patch hwloc to fix CVE-2022-47022 #12144

Open
wants to merge 2 commits into
base: fasttrack/3.0
Choose a base branch
from
+74 −1
Open

[Medium] patch hwloc to fix CVE-2022-47022 #12144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e4d094
patch hwloc to fix CVE-2022-47022
jykanase Jan 30, 2025
44462f8
Merge branch 'fasttrack/3.0' into topic_hwloc_3.0
sameluch Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 69 additions & 0 deletions SPECS/hwloc/CVE-2022-47022.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
From b85436757996b58b805dc4d471ec1cb3c6f56781 Mon Sep 17 00:00:00 2001
From: jykanase <[email protected]>
Date: Tue, 28 Jan 2025 12:11:44 +0000
Subject: [PATCH] CVE-2022-47022

Source Link: https://github.com/open-mpi/hwloc/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 c7b63d2..fd6745e 100644
--- a/hwloc/topology-linux.c
+++ b/hwloc/topology-linux.c
@@ -870,6 +870,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)
@@ -950,7 +952,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)
@@ -978,8 +983,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);

@@ -1333,6 +1342,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)
@@ -1424,6 +1435,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) {
--
2.45.2

6 changes: 5 additions & 1 deletion SPECS/hwloc/hwloc.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
Summary: Portable Hardware Locality - portable abstraction of hierarchical architectures
Name: hwloc
Version: 2.9.2
Release: 1%{?dist}
Release: 2%{?dist}
License: BSD-2-Clause
Vendor: Microsoft Corporation
Distribution: Azure Linux
URL: https://www.open-mpi.org/projects/hwloc/
Source0: http://www.open-mpi.org/software/hwloc/v2.9/downloads/%{name}-%{version}.tar.bz2
Patch0: CVE-2022-47022.patch
BuildRequires: gcc
# C++ only for hwloc-hello-cpp test:
BuildRequires: gcc-c++
Expand Down Expand Up @@ -167,6 +168,9 @@ LD_LIBRARY_PATH=$PWD/hwloc/.libs make check
%{_libdir}/%{name}/hwloc*

%changelog
* Wed Jan 29 2025 Jyoti Kanase <[email protected]> - 2.9.2-2
- Fix CVE-2022-47022

* Fri Oct 27 2023 CBL-Mariner Servicing Account <[email protected]> - 2.9.2-1
- Auto-upgrade to 2.9.2 - Azure Linux 3.0 - package upgrades

Expand Down
Loading