Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-08 19:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

efi_loader: eliminate efi_set_(non)volatile_variable

Browse source 
Eliminate superfluous functions efi_set_volatile_variable() and
efi_set_nonvolatile_variable().

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
This commit is contained in:
Heinrich Schuchardt 2020-05-03 10:02:20 +02:00
parent c08cac0edc
commit bb0e585c71
1 changed files with 37 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

141
lib/efi_loader/efi_variable.c
View file

@ -169,12 +169,12 @@ static const char *parse_attr(const char *str, u32 *attrp, u64 *timep)
return str; return str;
} }
static efi_status_t efi_set_variable_internal(u16 *variable_name, static efi_status_t efi_set_variable_common(u16 *variable_name,
const efi_guid_t *vendor, const efi_guid_t *vendor,
u32 attributes, u32 attributes,
efi_uintn_t data_size, efi_uintn_t data_size,
const void *data, const void *data,
bool ro_check); bool ro_check);
/** /**
* efi_set_secure_state - modify secure boot state variables * efi_set_secure_state - modify secure boot state variables
@ -196,35 +196,28 @@ static efi_status_t efi_set_secure_state(int sec_boot, int setup_mode,
attributes = EFI_VARIABLE_BOOTSERVICE_ACCESS | attributes = EFI_VARIABLE_BOOTSERVICE_ACCESS |
EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS |
READ_ONLY; READ_ONLY;
ret = efi_set_variable_internal(L"SecureBoot", ret = efi_set_variable_common(L"SecureBoot", &efi_global_variable_guid,
&efi_global_variable_guid, attributes, sizeof(sec_boot), &sec_boot,
attributes, false);
sizeof(sec_boot), &sec_boot,
false);
if (ret != EFI_SUCCESS) if (ret != EFI_SUCCESS)
goto err; goto err;
ret = efi_set_variable_internal(L"SetupMode", ret = efi_set_variable_common(L"SetupMode", &efi_global_variable_guid,
&efi_global_variable_guid, attributes, sizeof(setup_mode),
attributes, &setup_mode, false);
sizeof(setup_mode), &setup_mode,
false);
if (ret != EFI_SUCCESS) if (ret != EFI_SUCCESS)
goto err; goto err;
ret = efi_set_variable_internal(L"AuditMode", ret = efi_set_variable_common(L"AuditMode", &efi_global_variable_guid,
&efi_global_variable_guid, attributes, sizeof(audit_mode),
attributes, &audit_mode, false);
sizeof(audit_mode), &audit_mode,
false);
if (ret != EFI_SUCCESS) if (ret != EFI_SUCCESS)
goto err; goto err;
ret = efi_set_variable_internal(L"DeployedMode", ret = efi_set_variable_common(L"DeployedMode",
&efi_global_variable_guid, &efi_global_variable_guid, attributes,
attributes, sizeof(deployed_mode), &deployed_mode,
sizeof(deployed_mode), &deployed_mode, false);
false);
err: err:
return ret; return ret;
} }
@ -234,7 +227,7 @@ err:
* @mode: new state * @mode: new state
* *
* Depending on @mode, secure boot related variables are updated. * Depending on @mode, secure boot related variables are updated.
* Those variables are *read-only* for users, efi_set_variable_internal() * Those variables are *read-only* for users, efi_set_variable_common()
* is called here. * is called here.
* *
* Return: EFI_SUCCESS on success, status code (negative) on error * Return: EFI_SUCCESS on success, status code (negative) on error
@ -252,11 +245,10 @@ static efi_status_t efi_transfer_secure_state(enum efi_secure_mode mode)
efi_secure_boot = true; efi_secure_boot = true;
} else if (mode == EFI_MODE_AUDIT) { } else if (mode == EFI_MODE_AUDIT) {
ret = efi_set_variable_internal( ret = efi_set_variable_common(L"PK", &efi_global_variable_guid,
L"PK", &efi_global_variable_guid, EFI_VARIABLE_BOOTSERVICE_ACCESS |
EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
EFI_VARIABLE_RUNTIME_ACCESS, 0, NULL, false);
0, NULL, false);
if (ret != EFI_SUCCESS) if (ret != EFI_SUCCESS)
goto err; goto err;
@ -326,14 +318,13 @@ static efi_status_t efi_init_secure_state(void)
ret = efi_transfer_secure_state(mode); ret = efi_transfer_secure_state(mode);
if (ret == EFI_SUCCESS) if (ret == EFI_SUCCESS)
ret = efi_set_variable_internal(L"VendorKeys", ret = efi_set_variable_common(L"VendorKeys",
&efi_global_variable_guid, &efi_global_variable_guid,
EFI_VARIABLE_BOOTSERVICE_ACCESS EFI_VARIABLE_BOOTSERVICE_ACCESS |
| EFI_VARIABLE_RUNTIME_ACCESS EFI_VARIABLE_RUNTIME_ACCESS |
| READ_ONLY, READ_ONLY,
sizeof(efi_vendor_keys), sizeof(efi_vendor_keys),
&efi_vendor_keys, &efi_vendor_keys, false);
false);
err: err:
return ret; return ret;
@ -872,14 +863,12 @@ efi_status_t EFIAPI efi_get_next_variable_name(efi_uintn_t *variable_name_size,
return EFI_EXIT(ret); return EFI_EXIT(ret);
} }
static static efi_status_t efi_set_variable_common(u16 *variable_name,
efi_status_t EFIAPI efi_set_variable_common(u16 *variable_name,
const efi_guid_t *vendor, const efi_guid_t *vendor,
u32 attributes, u32 attributes,
efi_uintn_t data_size, efi_uintn_t data_size,
const void *data, const void *data,
bool ro_check, bool ro_check)
bool is_non_volatile)
{ {
char *native_name = NULL, *old_data = NULL, *val = NULL, *s; char *native_name = NULL, *old_data = NULL, *val = NULL, *s;
efi_uintn_t old_size; efi_uintn_t old_size;
@ -906,14 +895,6 @@ efi_status_t EFIAPI efi_set_variable_common(u16 *variable_name,
attr = 0; attr = 0;
ret = EFI_CALL(efi_get_variable(variable_name, vendor, &attr, ret = EFI_CALL(efi_get_variable(variable_name, vendor, &attr,
&old_size, NULL)); &old_size, NULL));
if (ret == EFI_BUFFER_TOO_SMALL) {
if ((is_non_volatile && !(attr & EFI_VARIABLE_NON_VOLATILE)) ||
(!is_non_volatile && (attr & EFI_VARIABLE_NON_VOLATILE))) {
ret = EFI_INVALID_PARAMETER;
goto err;
}
}
append = !!(attributes & EFI_VARIABLE_APPEND_WRITE); append = !!(attributes & EFI_VARIABLE_APPEND_WRITE);
attributes &= ~(u32)EFI_VARIABLE_APPEND_WRITE; attributes &= ~(u32)EFI_VARIABLE_APPEND_WRITE;
delete = !append && (!data_size || !attributes); delete = !append && (!data_size || !attributes);
@ -1087,7 +1068,7 @@ out:
/* update VendorKeys */ /* update VendorKeys */
if (vendor_keys_modified & efi_vendor_keys) { if (vendor_keys_modified & efi_vendor_keys) {
efi_vendor_keys = 0; efi_vendor_keys = 0;
ret = efi_set_variable_internal( ret = efi_set_variable_common(
L"VendorKeys", L"VendorKeys",
&efi_global_variable_guid, &efi_global_variable_guid,
EFI_VARIABLE_BOOTSERVICE_ACCESS EFI_VARIABLE_BOOTSERVICE_ACCESS
@ -1109,54 +1090,6 @@ err:
return ret; return ret;
} }
static
efi_status_t EFIAPI efi_set_volatile_variable(u16 *variable_name,
const efi_guid_t *vendor,
u32 attributes,
efi_uintn_t data_size,
const void *data,
bool ro_check)
{
return efi_set_variable_common(variable_name, vendor, attributes,
data_size, data, ro_check, false);
}
efi_status_t EFIAPI efi_set_nonvolatile_variable(u16 *variable_name,
const efi_guid_t *vendor,
u32 attributes,
efi_uintn_t data_size,
const void *data,
bool ro_check)
{
efi_status_t ret;
ret = efi_set_variable_common(variable_name, vendor, attributes,
data_size, data, ro_check, true);
return ret;
}
static efi_status_t efi_set_variable_internal(u16 *variable_name,
const efi_guid_t *vendor,
u32 attributes,
efi_uintn_t data_size,
const void *data,
bool ro_check)
{
efi_status_t ret;
if (attributes & EFI_VARIABLE_NON_VOLATILE)
ret = efi_set_nonvolatile_variable(variable_name, vendor,
attributes,
data_size, data, ro_check);
else
ret = efi_set_volatile_variable(variable_name, vendor,
attributes, data_size, data,
ro_check);
return ret;
}
/** /**
* efi_set_variable() - set value of a UEFI variable * efi_set_variable() - set value of a UEFI variable
* *
@ -1182,9 +1115,9 @@ efi_status_t EFIAPI efi_set_variable(u16 *variable_name,
/* READ_ONLY bit is not part of API */ /* READ_ONLY bit is not part of API */
attributes &= ~(u32)READ_ONLY; attributes &= ~(u32)READ_ONLY;
return EFI_EXIT(efi_set_variable_internal(variable_name, vendor, return EFI_EXIT(efi_set_variable_common(variable_name, vendor,
attributes, data_size, data, attributes, data_size, data,
true)); true));
} }
/** /**