leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

eficonfig: avoid SetVariable between GetNextVariableName calls

Browse Source 
The current code calls efi_set_variable_int() to delete the
invalid boot option between calls to efi_get_next_variable_name_int(),
it may produce unpredictable results.

This commit moves removal of the invalid boot option outside
of the efi_get_next_variable_name_int() calls.
EFI_NOT_FOUND returned from efi_get_next_variable_name_int()
indicates we retrieved all EFI variables, it should be treated
as EFI_SUCEESS.

To address the checkpatch warning of too many leading tabs,
combine two if statement into one.

Signed-off-by: Masahisa Kojima <masahisa.kojima@linaro.org>
Reviewed-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
This commit is contained in:
Masahisa Kojima 2022-12-19 11:33:13 +09:00 committed by Heinrich Schuchardt
parent ce3270849b
commit 645502743a
1 changed files with 38 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
cmd/eficonfig.c
View File

@ -2310,13 +2310,14 @@ out:
efi_status_t eficonfig_delete_invalid_boot_option(struct eficonfig_media_boot_option *opt, efi_status_t eficonfig_delete_invalid_boot_option(struct eficonfig_media_boot_option *opt,
efi_status_t count) efi_status_t count)
{ {
u32 i;
efi_uintn_t size; efi_uintn_t size;
void *load_option; void *load_option;
u32 i, list_size = 0;
struct efi_load_option lo; struct efi_load_option lo;
u16 *var_name16 = NULL; u16 *var_name16 = NULL;
u16 varname[] = u"Boot####"; u16 varname[] = u"Boot####";
efi_status_t ret = EFI_SUCCESS; efi_status_t ret = EFI_SUCCESS;
u16 *delete_index_list = NULL, *p;
efi_uintn_t buf_size; efi_uintn_t buf_size;
buf_size = 128; buf_size = 128;
@ -2331,8 +2332,14 @@ efi_status_t eficonfig_delete_invalid_boot_option(struct eficonfig_media_boot_op
efi_uintn_t tmp; efi_uintn_t tmp;
ret = efi_next_variable_name(&buf_size, &var_name16, &guid); ret = efi_next_variable_name(&buf_size, &var_name16, &guid);
if (ret == EFI_NOT_FOUND) if (ret == EFI_NOT_FOUND) {
/*
* EFI_NOT_FOUND indicates we retrieved all EFI variables.
* This should be treated as success.
*/
ret = EFI_SUCCESS;
break; break;
}
if (ret != EFI_SUCCESS) if (ret != EFI_SUCCESS)
goto out; goto out;
@ -2349,8 +2356,8 @@ efi_status_t eficonfig_delete_invalid_boot_option(struct eficonfig_media_boot_op
if (ret != EFI_SUCCESS) if (ret != EFI_SUCCESS)
goto next; goto next;
if (size >= sizeof(efi_guid_bootmenu_auto_generated)) { if (size >= sizeof(efi_guid_bootmenu_auto_generated) &&
if (guidcmp(lo.optional_data, &efi_guid_bootmenu_auto_generated) == 0) { !guidcmp(lo.optional_data, &efi_guid_bootmenu_auto_generated)) {
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
if (opt[i].size == tmp && if (opt[i].size == tmp &&
memcmp(opt[i].lo, load_option, tmp) == 0) { memcmp(opt[i].lo, load_option, tmp) == 0) {
@ -2359,21 +2366,36 @@ efi_status_t eficonfig_delete_invalid_boot_option(struct eficonfig_media_boot_op
} }
} }
/*
* The entire list of variables must be retrieved by
* efi_get_next_variable_name_int() before deleting the invalid
* boot option, just save the index here.
*/
if (i == count) { if (i == count) {
ret = delete_boot_option(i); p = realloc(delete_index_list, sizeof(u32) *
if (ret != EFI_SUCCESS) { (list_size + 1));
free(load_option); if (!p) {
ret = EFI_OUT_OF_RESOURCES;
goto out; goto out;
} }
} delete_index_list = p;
delete_index_list[list_size++] = index;
} }
} }
next: next:
free(load_option); free(load_option);
} }
/* delete all invalid boot options */
for (i = 0; i < list_size; i++) {
ret = delete_boot_option(delete_index_list[i]);
if (ret != EFI_SUCCESS)
goto out;
}
out: out:
free(var_name16); free(var_name16);
free(delete_index_list);
return ret; return ret;
} }