MSVSphere Packaging Team
1 year ago
parent
187eb282f8
commit
82b7fbbe58
@ -1 +1 @@
|
||||
SOURCES/numactl-2.0.14.tar.gz
|
||||
SOURCES/numactl-2.0.16.tar.gz
|
||||
|
||||
@ -1 +1 @@
|
||||
1325d20027bbfc9ec5b840a599f6773d38b54a00 SOURCES/numactl-2.0.14.tar.gz
|
||||
37ea1a333827f279e940bf0ae55d6897b331f19f SOURCES/numactl-2.0.16.tar.gz
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
From 93867c59b0bb29470873a427dc7f06ebaf305221 Mon Sep 17 00:00:00 2001
|
||||
From: Pingfan Liu <piliu@redhat.com>
|
||||
Date: Mon, 29 Mar 2021 17:33:06 +0800
|
||||
Subject: [PATCH] libnuma: make numa_police_memory() free of race
|
||||
|
||||
When numa_police_memory() read-write to memory, it can risk the race of
|
||||
another thread write to the same area.
|
||||
|
||||
Using atomic function to protect the read-write operation
|
||||
|
||||
Signed-off-by: Pingfan Liu <piliu@redhat.com>
|
||||
---
|
||||
libnuma.c | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/libnuma.c b/libnuma.c
|
||||
index f073c50..7b8290c 100644
|
||||
--- a/libnuma.c
|
||||
+++ b/libnuma.c
|
||||
@@ -864,8 +864,10 @@ void numa_police_memory(void *mem, size_t size)
|
||||
{
|
||||
int pagesize = numa_pagesize_int();
|
||||
unsigned long i;
|
||||
- for (i = 0; i < size; i += pagesize)
|
||||
- ((volatile char*)mem)[i] = ((volatile char*)mem)[i];
|
||||
+ char *p = mem;
|
||||
+ for (i = 0; i < size; i += pagesize, p += pagesize)
|
||||
+ __atomic_and_fetch(p, 0xff, __ATOMIC_RELAXED);
|
||||
+
|
||||
}
|
||||
|
||||
make_internal_alias(numa_police_memory);
|
||||
--
|
||||
2.29.2
|
||||
|
||||
@ -1,44 +0,0 @@
|
||||
From 7b5f3e98680f0720f9e6d06b6acdcbf92af4aedd Mon Sep 17 00:00:00 2001
|
||||
From: Pingfan Liu <piliu@redhat.com>
|
||||
Date: Thu, 10 Jun 2021 10:54:08 +0800
|
||||
Subject: [PATCH 2/6] shm.c: fix memleak in dump_shm()
|
||||
|
||||
Signed-off-by: Pingfan Liu <piliu@redhat.com>
|
||||
---
|
||||
shm.c | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/shm.c b/shm.c
|
||||
index 79043c9..c0b6ee3 100644
|
||||
--- a/shm.c
|
||||
+++ b/shm.c
|
||||
@@ -182,7 +182,7 @@ dumppol(unsigned long long start, unsigned long long end, int pol, struct bitmas
|
||||
/* Dump policies in a shared memory segment. */
|
||||
void dump_shm(void)
|
||||
{
|
||||
- struct bitmask *nodes, *prevnodes;
|
||||
+ struct bitmask *nodes, *prevnodes, *tag;
|
||||
int prevpol = -1, pol;
|
||||
unsigned long long c, start;
|
||||
|
||||
@@ -193,7 +193,7 @@ void dump_shm(void)
|
||||
}
|
||||
|
||||
nodes = numa_allocate_nodemask();
|
||||
- prevnodes = numa_allocate_nodemask();
|
||||
+ tag = prevnodes = numa_allocate_nodemask();
|
||||
|
||||
for (c = 0; c < shmlen; c += shm_pagesize) {
|
||||
if (get_mempolicy(&pol, nodes->maskp, nodes->size, c+shmptr,
|
||||
@@ -208,6 +208,8 @@ void dump_shm(void)
|
||||
start = c;
|
||||
}
|
||||
dumppol(start, c, prevpol, prevnodes);
|
||||
+ numa_free_nodemask(nodes);
|
||||
+ numa_free_nodemask(tag);
|
||||
}
|
||||
|
||||
static void dumpnode(unsigned long long start, unsigned long long end, int node)
|
||||
--
|
||||
2.29.2
|
||||
|
||||
@ -1,60 +0,0 @@
|
||||
From 8ae75219cc7a0dc69e77e22ba2547104078769d8 Mon Sep 17 00:00:00 2001
|
||||
From: Pingfan Liu <piliu@redhat.com>
|
||||
Date: Thu, 10 Jun 2021 11:06:07 +0800
|
||||
Subject: [PATCH 3/6] shm.c: fix memleak in verify_shm()
|
||||
|
||||
Signed-off-by: Pingfan Liu <piliu@redhat.com>
|
||||
---
|
||||
shm.c | 10 ++++++----
|
||||
1 file changed, 6 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/shm.c b/shm.c
|
||||
index c0b6ee3..e5192e5 100644
|
||||
--- a/shm.c
|
||||
+++ b/shm.c
|
||||
@@ -273,8 +273,6 @@ void verify_shm(int policy, struct bitmask *nodes)
|
||||
int pol2;
|
||||
struct bitmask *nodes2;
|
||||
|
||||
- nodes2 = numa_allocate_nodemask();
|
||||
-
|
||||
if (policy == MPOL_INTERLEAVE) {
|
||||
if (get_mempolicy(&ilnode, NULL, 0, shmptr,
|
||||
MPOL_F_ADDR|MPOL_F_NODE)
|
||||
@@ -282,6 +280,8 @@ void verify_shm(int policy, struct bitmask *nodes)
|
||||
err("get_mempolicy");
|
||||
}
|
||||
|
||||
+ nodes2 = numa_allocate_nodemask();
|
||||
+
|
||||
for (p = shmptr; p - (char *)shmptr < shmlen; p += shm_pagesize) {
|
||||
if (get_mempolicy(&pol2, nodes2->maskp, nodes2->size, p,
|
||||
MPOL_F_ADDR) < 0)
|
||||
@@ -289,7 +289,7 @@ void verify_shm(int policy, struct bitmask *nodes)
|
||||
if (pol2 != policy) {
|
||||
vwarn(p, "wrong policy %s, expected %s\n",
|
||||
policy_name(pol2), policy_name(policy));
|
||||
- return;
|
||||
+ goto out;
|
||||
}
|
||||
if (memcmp(nodes2, nodes, numa_bitmask_nbytes(nodes))) {
|
||||
vwarn(p, "mismatched node mask\n");
|
||||
@@ -307,7 +307,7 @@ void verify_shm(int policy, struct bitmask *nodes)
|
||||
if (node != ilnode) {
|
||||
vwarn(p, "expected interleave node %d, got %d\n",
|
||||
ilnode,node);
|
||||
- return;
|
||||
+ goto out;
|
||||
}
|
||||
ilnode = interleave_next(ilnode, nodes2);
|
||||
break;
|
||||
@@ -325,4 +325,6 @@ void verify_shm(int policy, struct bitmask *nodes)
|
||||
}
|
||||
}
|
||||
|
||||
+out:
|
||||
+ numa_free_nodemask(nodes2);
|
||||
}
|
||||
--
|
||||
2.29.2
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
From dfca78c8ee1d21d967b3a51d5488a8e8cd818ec4 Mon Sep 17 00:00:00 2001
|
||||
From: Pingfan Liu <piliu@redhat.com>
|
||||
Date: Thu, 10 Jun 2021 11:13:59 +0800
|
||||
Subject: [PATCH 4/6] sysfs.c: don't leak fd if fail in sysfs_read()
|
||||
|
||||
Signed-off-by: Pingfan Liu <piliu@redhat.com>
|
||||
---
|
||||
sysfs.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/sysfs.c b/sysfs.c
|
||||
index f1cdcdc..9ddf50d 100644
|
||||
--- a/sysfs.c
|
||||
+++ b/sysfs.c
|
||||
@@ -17,10 +17,10 @@ hidden char *sysfs_read(char *name)
|
||||
int n;
|
||||
int fd;
|
||||
|
||||
- fd = open(name, O_RDONLY);
|
||||
buf = malloc(SYSFS_BLOCK);
|
||||
if (!buf)
|
||||
return NULL;
|
||||
+ fd = open(name, O_RDONLY);
|
||||
n = read(fd, buf, SYSFS_BLOCK - 1);
|
||||
close(fd);
|
||||
if (n <= 0) {
|
||||
--
|
||||
2.29.2
|
||||
|
||||
@ -1,60 +0,0 @@
|
||||
From cc1d7d17c6d2df0f603932becf238fdf264a9e30 Mon Sep 17 00:00:00 2001
|
||||
From: Pingfan Liu <piliu@redhat.com>
|
||||
Date: Thu, 10 Jun 2021 11:17:40 +0800
|
||||
Subject: [PATCH 5/6] sysfs.c: prevent mem leak in sysfs_node_read()
|
||||
|
||||
Signed-off-by: Pingfan Liu <piliu@redhat.com>
|
||||
---
|
||||
sysfs.c | 23 +++++++++++++++--------
|
||||
1 file changed, 15 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/sysfs.c b/sysfs.c
|
||||
index 9ddf50d..a35c4b5 100644
|
||||
--- a/sysfs.c
|
||||
+++ b/sysfs.c
|
||||
@@ -33,7 +33,7 @@ hidden char *sysfs_read(char *name)
|
||||
|
||||
hidden int sysfs_node_read(struct bitmask *mask, char *fmt, ...)
|
||||
{
|
||||
- int n;
|
||||
+ int n, ret = 0;
|
||||
va_list ap;
|
||||
char *p, *fn, *m, *end;
|
||||
int num;
|
||||
@@ -51,12 +51,18 @@ hidden int sysfs_node_read(struct bitmask *mask, char *fmt, ...)
|
||||
m = p;
|
||||
do {
|
||||
num = strtol(m, &end, 0);
|
||||
- if (m == end)
|
||||
- return -1;
|
||||
- if (num < 0)
|
||||
- return -2;
|
||||
- if (num >= numa_num_task_nodes())
|
||||
- return -1;
|
||||
+ if (m == end) {
|
||||
+ ret = -1;
|
||||
+ goto out;
|
||||
+ }
|
||||
+ if (num < 0) {
|
||||
+ ret = -2;
|
||||
+ goto out;
|
||||
+ }
|
||||
+ if (num >= numa_num_task_nodes()) {
|
||||
+ ret = -1;
|
||||
+ goto out;
|
||||
+ }
|
||||
numa_bitmask_setbit(mask, num);
|
||||
|
||||
/* Continuation not supported by kernel yet. */
|
||||
@@ -64,6 +70,7 @@ hidden int sysfs_node_read(struct bitmask *mask, char *fmt, ...)
|
||||
while (isspace(*m) || *m == ',')
|
||||
m++;
|
||||
} while (isdigit(*m));
|
||||
+out:
|
||||
free(p);
|
||||
- return 0;
|
||||
+ return ret;
|
||||
}
|
||||
--
|
||||
2.29.2
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
From 498385e3aaf265d6e9786e0a391196cd82ab3260 Mon Sep 17 00:00:00 2001
|
||||
From: Pingfan Liu <piliu@redhat.com>
|
||||
Date: Fri, 18 Jun 2021 18:14:20 +0800
|
||||
Subject: [PATCH 6/6] numactl.c: fix use after free
|
||||
|
||||
The following command can trigger the bug
|
||||
numactl --length 65536 --shm xxx -p0 -V > /dev/null
|
||||
|
||||
So reset mask to block any new access inside this loop.
|
||||
|
||||
Signed-off-by: Pingfan Liu <piliu@redhat.com>
|
||||
---
|
||||
numactl.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/numactl.c b/numactl.c
|
||||
index 5a9d2df..ae41d6c 100644
|
||||
--- a/numactl.c
|
||||
+++ b/numactl.c
|
||||
@@ -544,6 +544,7 @@ int main(int ac, char **av)
|
||||
if (nnodes != 1)
|
||||
usage();
|
||||
numa_bitmask_free(mask);
|
||||
+ mask = NULL;
|
||||
errno = 0;
|
||||
did_node_cpu_parse = 1;
|
||||
numa_set_bind_policy(0);
|
||||
--
|
||||
2.29.2
|
||||
|
||||
Loading…
Reference in new issue