github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-23 14:07:42 +00:00
Code Issues Projects Releases Wiki Activity

hv: seed: fix potential NULL pointer dereferencing

Browse Source 
The 'boot_params' and 'entry' might be dereferenced after they were
positively checked for NULL. Refine checking logic to fix the issue.

Tracked-On: #2979
Signed-off-by: Qi Yadong <yadong.qi@intel.com>
Acked-by: Zhu Bing <bing.zhu@intel.com>
This commit is contained in:
Qi Yadong 2019-04-19 09:01:17 +08:00 committed by ACRN System Integration
parent 334c5ae701
commit fa47554054
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hypervisor/arch/x86/seed/seed_sbl.c
View File

@ -62,21 +62,21 @@ bool parse_seed_sbl(uint64_t addr, struct physical_seed *phy_seed)
{
uint8_t i;
uint8_t dseed_index = 0U;
struct image_boot_params *boot_params;
struct image_boot_params *boot_params = NULL;
struct seed_list_hob *seed_hob = NULL;
struct seed_entry *entry;
struct seed_info *seed_list;
struct seed_entry *entry = NULL;
struct seed_info *seed_list = NULL;
bool status = false;
stac();
boot_params = (struct image_boot_params *)hpa2hva(addr);
if ((boot_params != NULL) || (phy_seed != NULL)) {
if (boot_params != NULL) {
seed_hob = (struct seed_list_hob *)hpa2hva(boot_params->p_seed_list);
}
if (seed_hob != NULL) {
if ((seed_hob != NULL) && (phy_seed != NULL)) {
status = true;
seed_list = phy_seed->seed_list;
@ -106,9 +106,9 @@ bool parse_seed_sbl(uint64_t addr, struct physical_seed *phy_seed)
/* erase original seed in seed entry */
(void)memset((void *)&entry->seed[0U], 0U, sizeof(struct seed_info));
}
}
entry = (struct seed_entry *)((uint8_t *)entry + entry->seed_entry_size);
entry = (struct seed_entry *)((uint8_t *)entry + entry->seed_entry_size);
}
}
if (status) {