floraachy
/
OpenBLAS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix potential memory leak in cpu enumeration 

An early return after a failed call to sched_getaffinity would leak the memory allocated for the cpu_set_t. Also the size parameter to the
sched_getaffinity call could be incorrect, increasing the likelyhood of that failure
Fixes #2003
This commit is contained in:
Martin Kroeker 2019-02-07 22:39:03 +01:00 committed by GitHub
parent 1ba2b2e639
commit 8c58865aa5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
driver/others/memory.c
View File

@ -216,7 +216,7 @@ int i,n;
#endif #endif
#if !__GLIBC_PREREQ(2, 7) #if !__GLIBC_PREREQ(2, 7)
ret = sched_getaffinity(0,sizeof(cpu_set_t), cpusetp); ret = sched_getaffinity(0,sizeof(cpusetp), cpusetp);
if (ret!=0) return nums; if (ret!=0) return nums;
n=0; n=0;
#if !__GLIBC_PREREQ(2, 6) #if !__GLIBC_PREREQ(2, 6)
@ -224,15 +224,18 @@ int i,n;
if (CPU_ISSET(i,cpusetp)) n++; if (CPU_ISSET(i,cpusetp)) n++;
nums=n; nums=n;
#else #else
nums = CPU_COUNT(sizeof(cpu_set_t),cpusetp); nums = CPU_COUNT(sizeof(cpusetp),cpusetp);
#endif #endif
return nums; return nums;
#else #else
cpusetp = CPU_ALLOC(nums); cpusetp = CPU_ALLOC(nums);
if (cpusetp == NULL) return nums; if (cpusetp == NULL) return nums;
size = CPU_ALLOC_SIZE(nums); size = CPU_ALLOC_SIZE(nums);
ret = sched_getaffinity(0,size,cpusetp); ret = sched_getaffinity(0,sizeof(cpusetp),cpusetp);
if (ret!=0) return nums; if (ret!=0) {
CPU_FREE(cpusetp);
return nums;
}
ret = CPU_COUNT_S(size,cpusetp); ret = CPU_COUNT_S(size,cpusetp);
if (ret > 0 && ret < nums) nums = ret; if (ret > 0 && ret < nums) nums = ret;
CPU_FREE(cpusetp); CPU_FREE(cpusetp);
@ -1728,7 +1731,7 @@ int i,n;
#endif #endif
#if !__GLIBC_PREREQ(2, 7) #if !__GLIBC_PREREQ(2, 7)
ret = sched_getaffinity(0,sizeof(cpu_set_t), cpusetp); ret = sched_getaffinity(0,sizeof(cpusetp), cpusetp);
if (ret!=0) return nums; if (ret!=0) return nums;
n=0; n=0;
#if !__GLIBC_PREREQ(2, 6) #if !__GLIBC_PREREQ(2, 6)
@ -1736,15 +1739,18 @@ int i,n;
if (CPU_ISSET(i,cpusetp)) n++; if (CPU_ISSET(i,cpusetp)) n++;
nums=n; nums=n;
#else #else
nums = CPU_COUNT(sizeof(cpu_set_t),cpusetp); nums = CPU_COUNT(sizeof(cpusetp),cpusetp);
#endif #endif
return nums; return nums;
#else #else
cpusetp = CPU_ALLOC(nums); cpusetp = CPU_ALLOC(nums);
if (cpusetp == NULL) return nums; if (cpusetp == NULL) return nums;
size = CPU_ALLOC_SIZE(nums); size = CPU_ALLOC_SIZE(nums);
ret = sched_getaffinity(0,size,cpusetp); ret = sched_getaffinity(0,sizeof(cpusetp),cpusetp);
if (ret!=0) return nums; if (ret!=0) {
CPU_FREE(cpusetp);
return nums;
}
ret = CPU_COUNT_S(size,cpusetp); ret = CPU_COUNT_S(size,cpusetp);
if (ret > 0 && ret < nums) nums = ret; if (ret > 0 && ret < nums) nums = ret;
CPU_FREE(cpusetp); CPU_FREE(cpusetp);