1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
|
From ac1f8db9a0790d2bf153711ff4cbf6101f89aace Mon Sep 17 00:00:00 2001
From: Brice Goglin <Brice.Goglin@inria.fr>
Date: Wed, 23 Aug 2023 19:52:47 +0200
Subject: [PATCH] linux: handle glibc cpuset allocation failures
Closes #544
CVE-2022-47022
Signed-off-by: Brice Goglin <Brice.Goglin@inria.fr>
CVE: CVE-2022-47022
Upstream-Status: Backport [https://github.com/open-mpi/hwloc/commit/ac1f8db9a0790d2bf153711ff4cbf6101f89aace]
Signed-off-by: Soumya Sambu <soumya.sambu@windriver.com>
---
src/topology-linux.c | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/src/topology-linux.c b/src/topology-linux.c
index 62c3b44..86be150 100644
--- a/src/topology-linux.c
+++ b/src/topology-linux.c
@@ -623,6 +623,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)
@@ -703,7 +705,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)
@@ -732,8 +737,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);
@@ -1092,6 +1101,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)
@@ -1184,6 +1195,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.40.0
|
