Virtualization
/
edk2
mirror of https://gitlab.com/qemu-project/edk2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

SecurityPkg/SecureBootConfigDxe: Update UI according to UEFI spec 

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4713

In UEFI_Spec_2_10_Aug29.pdf page 1694 section 35.5.4 for
EFI_BROWSER_ACTION_FORM_OPEN:
NOTE: EFI_FORM_BROWSER2_PROTOCOL.BrowserCallback() cannot be used with
this browser action because question values have not been retrieved yet.

So should not call HiiGetBrowserData() and HiiSetBrowserData() in FORM_OPEN
call back function.

Now call SecureBootExtractConfigFromVariable() and update
IfrNvData->ListCount to save the change to EFI variable, then HII use EFI
variable to control the UI.

Cc: Min Xu <min.m.xu@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Dandan Bi <dandan.bi@intel.com>
Cc: Felix Polyudov <Felixp@ami.com>
Signed-off-by: Ming Tan <ming.tan@intel.com>
Reviewed-by: Felix Polyudov <Felixp@ami.com>
Reviewed-by: Dandan Bi <dandan.bi@intel.com>
Acked-by: Jiewen Yao <jiewen.yao@intel.com>
This commit is contained in:
Ming Tan 2024-04-02 16:32:19 +08:00 committed by mergify[bot]
parent 8707f835ae
commit ee28bea4c0
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c
View File

@ -3366,6 +3366,8 @@ SecureBootExtractConfigFromVariable (
ConfigData->FileEnrollType = UNKNOWN_FILE_TYPE; ConfigData->FileEnrollType = UNKNOWN_FILE_TYPE;
} }
ConfigData->ListCount = Private->ListCount;
// //
// If it is Physical Presence User, set the PhysicalPresent to true. // If it is Physical Presence User, set the PhysicalPresent to true.
// //
@ -4547,6 +4549,7 @@ SecureBootCallback (
SetupMode = NULL; SetupMode = NULL;
File = NULL; File = NULL;
EnrollKeyErrorCode = None_Error; EnrollKeyErrorCode = None_Error;
GetBrowserDataResult = FALSE;
if ((This == NULL) || (Value == NULL) || (ActionRequest == NULL)) { if ((This == NULL) || (Value == NULL) || (ActionRequest == NULL)) {
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
@ -4565,15 +4568,12 @@ SecureBootCallback (
return EFI_OUT_OF_RESOURCES; return EFI_OUT_OF_RESOURCES;
} }
GetBrowserDataResult = HiiGetBrowserData (&gSecureBootConfigFormSetGuid, mSecureBootStorageName, BufferSize, (UINT8 *)IfrNvData);
if (Action == EFI_BROWSER_ACTION_FORM_OPEN) { if (Action == EFI_BROWSER_ACTION_FORM_OPEN) {
if (QuestionId == KEY_SECURE_BOOT_MODE) { if (QuestionId == KEY_SECURE_BOOT_MODE) {
// //
// Update secure boot strings when opening this form // Update secure boot strings when opening this form
// //
Status = UpdateSecureBootString (Private); Status = UpdateSecureBootString (Private);
SecureBootExtractConfigFromVariable (Private, IfrNvData);
mIsEnterSecureBootForm = TRUE; mIsEnterSecureBootForm = TRUE;
} else { } else {
// //
@ -4587,23 +4587,22 @@ SecureBootCallback (
(QuestionId == KEY_SECURE_BOOT_DBT_OPTION)) (QuestionId == KEY_SECURE_BOOT_DBT_OPTION))
{ {
CloseEnrolledFile (Private->FileContext); CloseEnrolledFile (Private->FileContext);
} else if (QuestionId == KEY_SECURE_BOOT_DELETE_ALL_LIST) {
//
// Update ListCount field in varstore
// Button "Delete All Signature List" is
// enable when ListCount is greater than 0.
//
IfrNvData->ListCount = Private->ListCount;
} }
} }
goto EXIT; goto EXIT;
} }
GetBrowserDataResult = HiiGetBrowserData (&gSecureBootConfigFormSetGuid, mSecureBootStorageName, BufferSize, (UINT8 *)IfrNvData);
if (Action == EFI_BROWSER_ACTION_RETRIEVE) { if (Action == EFI_BROWSER_ACTION_RETRIEVE) {
Status = EFI_UNSUPPORTED; Status = EFI_UNSUPPORTED;
if (QuestionId == KEY_SECURE_BOOT_MODE) { if (QuestionId == KEY_SECURE_BOOT_MODE) {
if (mIsEnterSecureBootForm) { if (mIsEnterSecureBootForm) {
if (GetBrowserDataResult) {
SecureBootExtractConfigFromVariable (Private, IfrNvData);
}
Value->u8 = SECURE_BOOT_MODE_STANDARD; Value->u8 = SECURE_BOOT_MODE_STANDARD;
Status = EFI_SUCCESS; Status = EFI_SUCCESS;
} }
@ -4764,6 +4763,8 @@ SecureBootCallback (
L"Only Physical Presence User could delete PK in custom mode!", L"Only Physical Presence User could delete PK in custom mode!",
NULL NULL
); );
} else {
SecureBootExtractConfigFromVariable (Private, IfrNvData);
} }
} }
} }
@ -4827,6 +4828,7 @@ SecureBootCallback (
SECUREBOOT_DELETE_SIGNATURE_LIST_FORM, SECUREBOOT_DELETE_SIGNATURE_LIST_FORM,
OPTION_SIGNATURE_LIST_QUESTION_ID OPTION_SIGNATURE_LIST_QUESTION_ID
); );
IfrNvData->ListCount = Private->ListCount;
break; break;
// //
@ -4851,6 +4853,7 @@ SecureBootCallback (
SECUREBOOT_DELETE_SIGNATURE_LIST_FORM, SECUREBOOT_DELETE_SIGNATURE_LIST_FORM,
OPTION_SIGNATURE_LIST_QUESTION_ID OPTION_SIGNATURE_LIST_QUESTION_ID
); );
IfrNvData->ListCount = Private->ListCount;
break; break;
// //
@ -4875,6 +4878,7 @@ SecureBootCallback (
SECUREBOOT_DELETE_SIGNATURE_LIST_FORM, SECUREBOOT_DELETE_SIGNATURE_LIST_FORM,
OPTION_SIGNATURE_LIST_QUESTION_ID OPTION_SIGNATURE_LIST_QUESTION_ID
); );
IfrNvData->ListCount = Private->ListCount;
break; break;
case SECUREBOOT_DELETE_SIGNATURE_FROM_DBT: case SECUREBOOT_DELETE_SIGNATURE_FROM_DBT:
@ -4954,6 +4958,8 @@ SecureBootCallback (
L"Only supports DER-encoded X509 certificate, AUTH_2 format data & executable EFI image", L"Only supports DER-encoded X509 certificate, AUTH_2 format data & executable EFI image",
NULL NULL
); );
} else {
IfrNvData->ListCount = Private->ListCount;
} }
break; break;
@ -5005,6 +5011,8 @@ SecureBootCallback (
PromptString, PromptString,
NULL NULL
); );
} else {
SecureBootExtractConfigFromVariable (Private, IfrNvData);
} }
break; break;