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: code style change for abl_seed_parse.c

Browse Source 
- remove goto;

- make sure procedure has one exit point;

Tracked-On: #861
Signed-off-by: Victor Sun <victor.sun@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Victor Sun 2018-12-27 21:07:25 +08:00 committed by Eddie Dong
parent c572a9f503
commit dff6781293
1 changed files with 71 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

152
hypervisor/boot/sbl/abl_seed_parse.c
View File

@ -30,56 +30,49 @@ static void parse_seed_list_abl(void *param_addr)
uint32_t legacy_seed_index = 0U; uint32_t legacy_seed_index = 0U;
struct seed_info dseed_list[BOOTLOADER_SEED_MAX_ENTRIES]; struct seed_info dseed_list[BOOTLOADER_SEED_MAX_ENTRIES];
struct dev_sec_info *sec_info = (struct dev_sec_info *)param_addr; struct dev_sec_info *sec_info = (struct dev_sec_info *)param_addr;
bool parse_success = false;
if (sec_info == NULL) { if ((sec_info != NULL) && (sec_info->num_seeds >= 2U) && (sec_info->num_seeds <= ABL_SEED_LIST_MAX)) {
goto fail; /*
} * The seed_list from ABL contains several seeds which based on SVN
* and one legacy seed which is not based on SVN. The legacy seed's
if (sec_info->num_seeds < 2U || * svn value is minimum in the seed list. And CSE ensures at least two
sec_info->num_seeds > ABL_SEED_LIST_MAX) { * seeds will be generated which will contain the legacy seed.
goto fail; * Here find the legacy seed index first.
} */
for (i = 1U; i < sec_info->num_seeds; i++) {
/* if (sec_info->seed_list[i].svn < sec_info->seed_list[legacy_seed_index].svn) {
* The seed_list from ABL contains several seeds which based on SVN legacy_seed_index = i;
* and one legacy seed which is not based on SVN. The legacy seed's }
* svn value is minimum in the seed list. And CSE ensures at least two
* seeds will be generated which will contain the legacy seed.
* Here find the legacy seed index first.
*/
for (i = 1U; i < sec_info->num_seeds; i++) {
if (sec_info->seed_list[i].svn <
sec_info->seed_list[legacy_seed_index].svn) {
legacy_seed_index = i;
}
}
/*
* Copy out abl_seed for trusty and clear the original seed in memory.
* The SOS requires the legacy seed to derive RPMB key. So skip the
* legacy seed when clear original seed.
*/
(void)memset((void *)dseed_list, 0U, sizeof(dseed_list));
for (i = 0U; i < sec_info->num_seeds; i++) {
dseed_list[i].cse_svn = sec_info->seed_list[i].svn;
(void)memcpy_s((void *)dseed_list[i].seed,
sizeof(dseed_list[i].seed),
(void *)sec_info->seed_list[i].seed,
sizeof(sec_info->seed_list[i].seed));
if (i == legacy_seed_index) {
continue;
} }
(void)memset((void *)sec_info->seed_list[i].seed, 0U, /*
sizeof(sec_info->seed_list[i].seed)); * Copy out abl_seed for trusty and clear the original seed in memory.
* The SOS requires the legacy seed to derive RPMB key. So skip the
* legacy seed when clear original seed.
*/
(void)memset((void *)dseed_list, 0U, (BOOTLOADER_SEED_MAX_ENTRIES * sizeof(struct seed_info)));
for (i = 0U; i < sec_info->num_seeds; i++) {
dseed_list[i].cse_svn = sec_info->seed_list[i].svn;
(void)memcpy_s((void *)dseed_list[i].seed, sizeof(dseed_list[i].seed),
(void *)sec_info->seed_list[i].seed, sizeof(sec_info->seed_list[i].seed));
if (i == legacy_seed_index) {
continue;
}
(void)memset((void *)sec_info->seed_list[i].seed, 0U, sizeof(sec_info->seed_list[i].seed));
}
parse_success = true;
}
if (parse_success) {
trusty_set_dseed((void *)dseed_list, (uint8_t)(sec_info->num_seeds));
} else {
trusty_set_dseed(NULL, 0U);
} }
trusty_set_dseed((void *)dseed_list, (uint8_t)(sec_info->num_seeds));
(void)memset((void *)dseed_list, 0U, sizeof(dseed_list));
return;
fail:
trusty_set_dseed(NULL, 0U);
(void)memset((void *)dseed_list, 0U, sizeof(dseed_list)); (void)memset((void *)dseed_list, 0U, sizeof(dseed_list));
} }
@ -111,45 +104,42 @@ bool abl_seed_parse(struct acrn_vm *vm, char *cmdline, char *out_arg, uint32_t o
char *param; char *param;
void *param_addr; void *param_addr;
uint32_t len; uint32_t len;
bool parse_success = false;
if (cmdline == NULL) { if (cmdline != NULL) {
goto fail;
len = strnlen_s(dev_sec_info_arg, MEM_1K);
arg = strstr_s((const char *)cmdline, MEM_2K, dev_sec_info_arg, len);
if (arg != NULL) {
param = arg + len;
param_addr = (void *)hpa2hva(strtoul_hex(param));
if (param_addr != NULL) {
parse_seed_list_abl(param_addr);
/*
* Replace original arguments with spaces since SOS's GPA is not
* identity mapped to HPA. The argument will be appended later when
* compose cmdline for SOS.
*/
arg_end = strchr(arg, ' ');
len = (arg_end != NULL) ? (uint32_t)(arg_end - arg) : strnlen_s(arg, MEM_2K);
(void)memset((void *)arg, ' ', len);
/* Convert the param_addr to SOS GPA and copy to caller */
if (out_arg != NULL) {
snprintf(out_arg, out_len, "%s0x%X ",
dev_sec_info_arg, hva2gpa(vm, param_addr));
}
parse_success = true;
}
}
} }
len = strnlen_s(dev_sec_info_arg, MEM_1K); if (!parse_success) {
arg = strstr_s(cmdline, MEM_2K, dev_sec_info_arg, len); parse_seed_list_abl(NULL);
if (arg == NULL) {
goto fail;
} }
param = arg + len; return parse_success;
param_addr = (void *)hpa2hva(strtoul_hex(param));
if (param_addr == NULL) {
goto fail;
}
parse_seed_list_abl(param_addr);
/*
* Replace original arguments with spaces since SOS's GPA is not
* identity mapped to HPA. The argument will be appended later when
* compose cmdline for SOS.
*/
arg_end = strchr(arg, ' ');
len = (arg_end != NULL) ? (uint32_t)(arg_end - arg) :
strnlen_s(arg, MEM_2K);
(void)memset((void *)arg, ' ', len);
/* Convert the param_addr to SOS GPA and copy to caller */
if (out_arg != NULL) {
snprintf(out_arg, out_len, "%s0x%X ",
dev_sec_info_arg, hva2gpa(vm, param_addr));
}
return true;
fail:
parse_seed_list_abl(NULL);
return false;
} }