ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Avoid crash in min/max caculation when cpu#0 being offline 

When cpu#0 is offline, atof(NULL) is called which causes
a segfault or endless loop depending on implementation
circumstances. So instead of implicitely assumping that the
first cpu is always available, do the presence checks for
all including the first one.
This commit is contained in:
Dirk Mueller 2018-03-17 13:18:38 +01:00
parent 80ec018c6a
commit 95f09bc63c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys-utils/lscpu.c
View File

@ -1108,10 +1108,10 @@ static char *
cpu_max_mhz(struct lscpu_desc *desc, char *buf, size_t bufsz)
{
int i;
float cpu_freq = atof(desc->maxmhz[0]);
float cpu_freq = 0.0;
if (desc->present) {
for (i = 1; i < desc->ncpuspos; i++) {
for (i = 0; i < desc->ncpuspos; i++) {
if (CPU_ISSET(real_cpu_num(desc, i), desc->present)
&& desc->maxmhz[i]) {
float freq = atof(desc->maxmhz[i]);
@ -1129,16 +1129,16 @@ cpu_max_mhz(struct lscpu_desc *desc, char *buf, size_t bufsz)
static char *
cpu_min_mhz(struct lscpu_desc *desc, char *buf, size_t bufsz)
{
int i;
float cpu_freq = atof(desc->minmhz[0]);
int i;
float cpu_freq = -1.0;
if (desc->present) {
for (i = 1; i < desc->ncpuspos; i++) {
for (i = 0; i < desc->ncpuspos; i++) {
if (CPU_ISSET(real_cpu_num(desc, i), desc->present)
&& desc->minmhz[i]) {
float freq = atof(desc->minmhz[i]);
if (freq < cpu_freq)
if (cpu_freq < 0.0 || freq < cpu_freq)
cpu_freq = freq;
}
}