OrgACRN
/
acrn-hypervisor
mirror of https://github.com/projectacrn/acrn-hypervisor.git
1
0
Fork 0
Code Issues Releases Wiki Activity

tools: acrnctl fix potential buffer overflow 

When run 'acrnctl add', acrnctl dryruns launch script to get
vmname. Acrnctl assumes there are no more than 64 words in each
line of the script, and creates a buffer to hold 64 pointers to these
words. But we didn't check if the number of words exceed 64 limitation,
which can lead to buffer overflow. This commit fixed this potential
overflow problem.
And also refine some confusing error messages in 'acrnctl add'

Tracked-On: #2734
Acked-by: Yan Like <like.yan@intel.com>
Signed-off-by: Tao Yuhong <yuhong.tao@intel.com>
Reviewed-by: Yonghua Huang <yonghua.huang@intel.com>
This commit is contained in:
yuhong.tao@intel.com 2019-03-12 19:01:00 +08:00 committed by wenlingz
parent 78890622b2
commit bd24e2de74
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/acrn-manager/acrnctl.c
View File

@ -181,7 +181,7 @@ static int acrnctl_do_add(int argc, char *argv[])
size_t len = sizeof(cmd_out);
if (strnlen(argv[1], FILE_NAME_LENGTH) == FILE_NAME_LENGTH) {
printf("file name too long: %s\n", argv[1]);
printf("File name too long (maximum len %d)\n", FILE_NAME_LENGTH);
return -1;
}
@ -190,7 +190,7 @@ static int acrnctl_do_add(int argc, char *argv[])
for (i = 2; i < argc; i++) {
if (p >= sizeof(args) - 1) {
args[sizeof(args) - 1] = 0;
printf("Too many optional args: %s\n", args);
printf("Too many input options\n");
return -1;
}
@ -258,7 +258,7 @@ static int acrnctl_do_add(int argc, char *argv[])
word_p = NULL;
n_word = 0;
word[n_word] = strtok_r(line, " ", &word_p);
while (word[n_word]) {
while ((n_word < (MAX_WORD-1)) && word[n_word]) {
n_word++;
word[n_word] = strtok_r(NULL, " ", &word_p);
}
@ -271,9 +271,7 @@ static int acrnctl_do_add(int argc, char *argv[])
}
if (!find_acrn_dm) {
printf
("Don't see 'acrn-dm' in %s, maybe it is in another script, "
"this is no supported for now\n", argv[1]);
printf("No 'acrn-dm' found in %s, expecting 'acrn-dm' command to get vmname.\n", argv[1]);
ret = -1;
goto no_acrn_dm;
}
@ -330,8 +328,7 @@ static int acrnctl_do_add(int argc, char *argv[])
/* Properly null-terminate cmd_out */
cmd_out[len - 1] = '\0';
printf("%s can't reach acrn-dm, "
"please try again when you make sure it can launch an UOS\n"
printf("No executable acrn-dm found: %s, ,please make sure it can launch an UOS\n"
"result:\n%s\n", argv[1], cmd_out);
goto get_vmname;
}