github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2026-06-08 18:14:53 +00:00
Code Issues Projects Releases Wiki Activity

tools: acrn-crashlog: Fix potential issues under acrnprobe

Browse Source 
This patch is to fix potential issues, which are reported by static
analysis tool, for acrnprobe.

Changes:
1. Check the return value of sender_id() and get_sender_by_name(),
   since it could be -1 or NULL.
2. Remove the parameter len from create_event, take parameter path
   as a NULL-terminated string as default.
3. Modify for_each_* functions to avoid overflow.

Signed-off-by: Liu Xinwu <xinwu.liu@intel.com>
Reviewed-by: Zhi Jin <zhi.jin@intel.com>
Acked-by: Chen Gang <gang.c.chen@intel.com>
This commit is contained in:
xiaojin2
2018-06-08 13:15:29 +08:00
committed by lijinxia
parent 0c39b9cddc
commit 3e8e607d5b
7 changed files with 123 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
tools/acrn-crashlog/acrnprobe/android_events.c
View File

@@ -119,17 +119,22 @@ static int refresh_key_synced_stage1(struct sender_t *sender, struct vm_t *vm,
char *key, enum refresh_type_t type)
{
char log_new[64];
char *log_vmrecordid = sender->log_vmrecordid;
char *log_vmrecordid;
int sid;
if (!key || !sender || !vm)
return -1;
sid = sender_id(sender);
if (sid == -1)
return -1;
log_vmrecordid = sender->log_vmrecordid;
/* the length of key must be 20, and its value can not be
* 00000000000000000000.
*/
if ((strlen(key) == 20) &&
strcmp(key, "00000000000000000000")) {
sprintf(vm->last_synced_line_key[sender_id(sender)],
sprintf(vm->last_synced_line_key[sid],
"%s", key);
if (type == MM_ONLY)
return 0;
@@ -158,6 +163,9 @@ static int refresh_key_synced_stage2(struct mm_file_t *m_vm_records, char *key)
if (*key) {
begin = strstr(m_vm_records->begin, " <==");
end = strrstr(m_vm_records->begin, key);
if (!begin || !end)
return -1;
end = strchr(end, '\n');
for (p = begin; p < end; p++) {
@@ -183,6 +191,8 @@ static int get_vm_history(struct vm_t *vm, struct sender_t *sender,
return -1;
sid = sender_id(sender);
if (sid == -1)
return -1;
snprintf(vm_history, sizeof(vm_history), "/tmp/%s_%s",
"vm_hist", vm->name);
@@ -221,6 +231,9 @@ static void sync_lines_stage1(struct sender_t *sender, void *data[])
char *vm_format = "%*[^ ]%*[ ]%[^ ]%*c";
sid = sender_id(sender);
if (sid == -1)
return;
for_each_vm(id, vm, conf) {
if (!vm)
continue;
@@ -287,6 +300,10 @@ static void sync_lines_stage2(struct sender_t *sender, void *data[],
strerror(errno));
return;
}
if (!m_vm_records->size) {
LOGE("size(0b) of (%s)\n", sender->log_vmrecordid);
return;
}
cursor = strstr(m_vm_records->begin, " <==");
if (!cursor)
@@ -334,11 +351,19 @@ out:
static void get_last_line_synced(struct sender_t *sender)
{
int id;
int sid;
int ret;
struct vm_t *vm;
char vmkey[SHA_DIGEST_LENGTH + 10] = {0};
char word[256];
if (!sender)
return;
sid = sender_id(sender);
if (sid == -1)
return;
for_each_vm(id, vm, conf) {
if (!vm)
continue;
@@ -347,7 +372,7 @@ static void get_last_line_synced(struct sender_t *sender)
continue;
/* generally only exec for each vm once */
if (vm->last_synced_line_key[sender_id(sender)][0])
if (vm->last_synced_line_key[sid][0])
continue;
snprintf(word, sizeof(word), "%s ", vm->name);
@@ -406,6 +431,7 @@ static char *setup_loop_dev(void)
* launch_UOS.sh, we need mount its data partition to loop device
*/
char *out;
char *end;
char loop_dev_tmp[32];
int i;
@@ -440,7 +466,9 @@ static char *setup_loop_dev(void)
}
}
}
*strchr(loop_dev, '\n') = 0;
end = strchr(loop_dev, '\n');
if (end)
*end = 0;
out = exec_out2mem("fdisk -lu %s", android_img);
if (!out) {