sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check the validation when return from callback function to avoid use the invalid form set.

Browse Source 
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15654 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Eric Dong
2014-07-14 06:14:20 +00:00
committed by ydong10
parent 0ca7b0b841
commit 93551a01fe
3 changed files with 156 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
View File

@ -206,19 +206,56 @@ UiFindMenuList (
Find parent menu for current menu.
@param CurrentMenu Current Menu
@param SettingLevel Whether find parent menu in Form Level or Formset level.
In form level, just find the parent menu;
In formset level, find the parent menu which has different
formset guid value.
@retval The parent menu for current menu.
**/
FORM_ENTRY_INFO *
UiFindParentMenu (
IN FORM_ENTRY_INFO *CurrentMenu
IN FORM_ENTRY_INFO *CurrentMenu,
IN BROWSER_SETTING_SCOPE SettingLevel
)
{
FORM_ENTRY_INFO *ParentMenu;
LIST_ENTRY *Link;
ASSERT (SettingLevel == FormLevel || SettingLevel == FormSetLevel);
if (CurrentMenu == NULL) {
return NULL;
}
ParentMenu = NULL;
if (CurrentMenu->Link.BackLink != &mPrivateData.FormBrowserEx2.FormViewHistoryHead) {
ParentMenu = FORM_ENTRY_INFO_FROM_LINK (CurrentMenu->Link.BackLink);
Link = &CurrentMenu->Link;
while (Link->BackLink != &mPrivateData.FormBrowserEx2.FormViewHistoryHead) {
ParentMenu = FORM_ENTRY_INFO_FROM_LINK (Link->BackLink);
if (SettingLevel == FormLevel) {
//
// For FormLevel, just find the parent menu, return.
//
break;
}
if (!CompareGuid (&CurrentMenu->FormSetGuid, &ParentMenu->FormSetGuid)) {
//
// For SystemLevel, must find the menu which has different formset.
//
break;
}
Link = Link->BackLink;
}
//
// Not find the parent menu, just return NULL.
//
if (Link->BackLink == &mPrivateData.FormBrowserEx2.FormViewHistoryHead) {
return NULL;
}
return ParentMenu;
@ -481,6 +518,14 @@ SendForm (
FormSet = AllocateZeroPool (sizeof (FORM_BROWSER_FORMSET));
ASSERT (FormSet != NULL);
//
// Validate the HiiHandle
// if validate failed, find the first validate parent HiiHandle.
//
if (!ValidateHiiHandle(Selection->Handle)) {
FindNextMenu (Selection, FormSetLevel);
}
//
// Initialize internal data structures of FormSet
//
@ -2356,40 +2401,60 @@ SendDiscardInfoToDriver (
**/
BOOLEAN
ValidateFormSet (
FORM_BROWSER_FORMSET *FormSet
ValidateHiiHandle (
EFI_HII_HANDLE HiiHandle
)
{
EFI_HII_HANDLE *HiiHandles;
UINTN Index;
BOOLEAN Find;
ASSERT (FormSet != NULL);
if (HiiHandle == NULL) {
return FALSE;
}
Find = FALSE;
//
// Get all the Hii handles
//
HiiHandles = HiiGetHiiHandles (NULL);
ASSERT (HiiHandles != NULL);
//
// Search for formset of each class type
//
for (Index = 0; HiiHandles[Index] != NULL; Index++) {
if (HiiHandles[Index] == FormSet->HiiHandle) {
if (HiiHandles[Index] == HiiHandle) {
Find = TRUE;
break;
}
}
FreePool (HiiHandles);
return Find;
}
/**
Validate the FormSet. If the formset is not validate, remove it from the list.
@param FormSet The input FormSet which need to validate.
@retval TRUE The handle is validate.
@retval FALSE The handle is invalidate.
**/
BOOLEAN
ValidateFormSet (
FORM_BROWSER_FORMSET *FormSet
)
{
BOOLEAN Find;
ASSERT (FormSet != NULL);
Find = ValidateHiiHandle(FormSet->HiiHandle);
if (!Find) {
CleanBrowserStorage(FormSet);
RemoveEntryList (&FormSet->Link);
DestroyFormSet (FormSet);
}
FreePool (HiiHandles);
return Find;
}
/**