diff options
| author | GregX Yeh <devel@edk2.groups.io> | 2019-07-09 11:46:54 +0000 |
|---|---|---|
| committer | Jian J Wang <jian.j.wang@intel.com> | 2019-07-10 09:57:52 +0800 |
| commit | 034a3b4f555c6844673a5ee6b7aa4faa74e90a6e (patch) | |
| tree | 219003351ebdc0a4b000ee99dd8eb41df1b3ef70 /MdeModulePkg | |
| parent | 688ec2d00651471a7f90537aef973b9c94931fd6 (diff) | |
| download | edk2-034a3b4f555c6844673a5ee6b7aa4faa74e90a6e.tar.gz edk2-034a3b4f555c6844673a5ee6b7aa4faa74e90a6e.tar.bz2 edk2-034a3b4f555c6844673a5ee6b7aa4faa74e90a6e.zip | |
MdeModulePkg/Setup: Check ConfigAccess protocol in case it's destroyed
https://bugzilla.tianocore.org/show_bug.cgi?id=1920
Check ConfigAccess protocol is available before process user input.
Signed-off-by: GregX Yeh <gregx.yeh@intel.com>
Cc: Dandan Bi <dandan.bi@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Ted Kuo <ted.kuo@intel.com>
Reviewed-by: Dandan Bi <dandan.bi@intel.com>
Diffstat (limited to 'MdeModulePkg')
| -rw-r--r-- | MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c index d7927725b2..7c36a6f2b7 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c +++ b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c @@ -21,6 +21,38 @@ FORM_DISPLAY_ENGINE_FORM gDisplayFormData; BOOLEAN mFinishRetrieveCall = FALSE;
/**
+ Check whether the ConfigAccess protocol is available
+
+ @parm FormSet FormSet of which the ConfigAcces protocol need to be checked.
+
+ @retval EFI_SUCCESS The function executed successfully.
+
+**/
+EFI_STATUS
+CheckConfigAccess(
+ IN FORM_BROWSER_FORMSET *FormSet
+ )
+{
+ EFI_STATUS Status;
+
+ Status = gBS->HandleProtocol (
+ FormSet->DriverHandle,
+ &gEfiHiiConfigAccessProtocolGuid,
+ (VOID **) &FormSet->ConfigAccess
+ );
+ if (EFI_ERROR (Status)) {
+ //
+ // Configuration Driver don't attach ConfigAccess protocol to its HII package
+ // list, then there will be no configuration action required.
+ // Or the ConfigAccess protocol has been uninstalled.
+ //
+ FormSet->ConfigAccess = NULL;
+ }
+
+ return EFI_SUCCESS;
+}
+
+/**
Evaluate all expressions in a Form.
@param FormSet FormSet this Form belongs to.
@@ -1686,6 +1718,8 @@ DisplayForm ( return Status;
}
+ CheckConfigAccess(gCurrentSelection->FormSet);
+
Status = ProcessUserInput (&UserInput);
FreeDisplayFormData();
return Status;
|