github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-05-16 12:19:42 +00:00
Code Issues Projects Releases Wiki Activity

acrn-dm: fix corner cases in acrn_parse_cpu_affinity()

Browse Source 
- re-arange the code to make static code analysis tool happy.

- If no valid conversion could be performed, a zero value is returned
  (0L) from strtol(), so add a sanity check "isdigit(cp[0])" to ensure
  that it won't unexpectedly parse CPU 0 if the string starts or ends
  with the valid delimiters ',' or '-', for example:

  -- cpu_affinity 1,
  -- cpu_affinity ,1

Tracked-On: #4616
Signed-off-by: Zide Chen <zide.chen@intel.com>
This commit is contained in:
Zide Chen 2020-04-27 11:46:06 -07:00 committed by wenlingz
parent 0f6d11866b
commit f6a7206200
1 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
devicemodel/core/vmmapi.c
View File

@ -132,46 +132,47 @@ int acrn_parse_cpu_affinity(char *opt)
return -1;
}
while (cp) {
/* white spaces within the commane line are invalid */
while (cp && isdigit(cp[0])) {
str = strpbrk(cp, ",-");
/* no more entries delimited by ',' or '-' */
if (!str) {
if (!dm_strtoi(cp, NULL, 10, &pcpu_id)) {
add_one_pcpu(pcpu_id);
break;
}
}
break;
} else {
if (*str == ',') {
/* after this, 'cp' points to the character after ',' */
str = strsep(&cp, ",");
if (*str == ',') {
/* after this, 'cp' points to the character after ',' */
str = strsep(&cp, ",");
/* parse the entry before ',' */
if (dm_strtoi(str, NULL, 10, &pcpu_id)) {
return -1;
}
add_one_pcpu(pcpu_id);
}
if (*str == '-') {
str = strsep(&cp, "-");
/* parse the entry before and after '-' respectively */
if (dm_strtoi(str, NULL, 10, &pcpu_start) || dm_strtoi(cp, NULL, 10, &pcpu_end)) {
return -1;
/* parse the entry before ',' */
if (dm_strtoi(str, NULL, 10, &pcpu_id)) {
return -1;
}
add_one_pcpu(pcpu_id);
}
if (pcpu_end <= pcpu_start) {
return -1;
}
if (*str == '-') {
str = strsep(&cp, "-");
for (; pcpu_start <= pcpu_end; pcpu_start++) {
add_one_pcpu(pcpu_start);
}
/* parse the entry before and after '-' respectively */
if (dm_strtoi(str, NULL, 10, &pcpu_start) || dm_strtoi(cp, NULL, 10, &pcpu_end)) {
return -1;
}
/* skip the ',' after pcpu_end */
str = strsep(&cp, ",");
if (pcpu_end <= pcpu_start) {
return -1;
}
for (; pcpu_start <= pcpu_end; pcpu_start++) {
add_one_pcpu(pcpu_start);
}
/* skip the ',' after pcpu_end */
str = strsep(&cp, ",");
}
}
}