github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2026-06-09 02:24:45 +00:00
Code Issues Projects Releases Wiki Activity

tools: acrn-crashlog: update string operation in acrnprobe

Browse Source 
Remove unsafe api strlen except the parameter is a static string.

Tracked-On: #1254
Signed-off-by: Liu, Xinwu <xinwu.liu@intel.com>
Reviewed-by: Yonghua Huang <yonghua.huang@intel.com>
Acked-by: Chen Gang <gang.c.chen@intel.com>
This commit is contained in:
Liu, Xinwu
2018-09-26 15:23:41 +08:00
committed by Xie, Nanlin
parent 6938caa25f
commit f25bc50e68
9 changed files with 238 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tools/acrn-crashlog/acrnprobe/startupreason.c
View File

@@ -35,10 +35,10 @@ static int get_cmdline_bootreason(char *bootreason, const size_t limit)
int res;
unsigned long size;
char *start, *p1, *p2, *end;
void *cmdline;
const char key[] = "ABL.reset=";
char *cmdline;
const char *key = "ABL.reset=";
res = read_file(CURRENT_KERNEL_CMDLINE, &size, &cmdline);
res = read_file(CURRENT_KERNEL_CMDLINE, &size, (void *)&cmdline);
if (res < 0) {
LOGE("failed to read file %s - %s\n",
CURRENT_KERNEL_CMDLINE, strerror(errno));
@@ -66,13 +66,15 @@ static int get_cmdline_bootreason(char *bootreason, const size_t limit)
else
end = MAX(p1, p2);
if (end)
*end = 0;
if (!end)
end = cmdline + size;
const size_t len = MIN(strlen(start), limit - 1);
const size_t len = MIN((size_t)(end - start), (size_t)(limit - 1));
if (len > 0)
memcpy(bootreason, start, len + 1);
if (len > 0) {
memcpy(bootreason, start, len);
*(bootreason + len) = 0;
}
free(cmdline);
return len;
@@ -99,6 +101,9 @@ void read_startupreason(char *startupreason, const size_t limit)
int res;
static char reboot_reason_cache[REBOOT_REASON_SIZE];
if (!startupreason || !limit)
return;
if (!reboot_reason_cache[0]) {
/* fill cache */
res = get_default_bootreason(reboot_reason_cache,
@@ -108,7 +113,8 @@ void read_startupreason(char *startupreason, const size_t limit)
sizeof(reboot_reason_cache));
}
const size_t len = MIN(strlen(reboot_reason_cache), limit - 1);
const size_t len = MIN(strnlen(reboot_reason_cache, REBOOT_REASON_SIZE),
limit - 1);
memcpy(startupreason, reboot_reason_cache, len);
*(startupreason + len) = 0;