<div> </div>
<div>REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3648</div>
<div> </div>
<div>Register SmmExitBootServices and SmmLegacyBoot callback function to unregister this handler.</div>
<div> </div>
<div>Signed-off-by: Hao Shi <hao.shi@intel.com></div>
<div>Cc: Dandan Bi <dandan.bi@intel.com></div>
<div>Cc: Liming Gao <gaoliming@byosoft.com.cn></div>
<div>---</div>
<div> .../UserAuthenticationSmm.c | 34 +++++++++++++++++++</div>
<div> .../UserAuthenticationSmm.inf | 2 ++</div>
<div> 2 files changed, 36 insertions(+)</div>
<div> </div>
<div>diff --git a/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationSmm.c b/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationSmm.c</div>
<div>index 07e834eb..30f889dd 100644</div>
<div>--- a/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationSmm.c</div>
<div>+++ b/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationSmm.c</div>
<div>@@ -13,6 +13,7 @@ UINTN mAdminPasswordTryCount = 0;</div>
<div> </div>
<div> BOOLEAN mNeedReVerify = TRUE;</div>
<div> BOOLEAN mPasswordVerified = FALSE;</div>
<div>+EFI_HANDLE mSmmHandle = NULL;</div>
<div> </div>
<div> /**</div>
<div> Verify if the password is correct.</div>
<div>@@ -612,6 +613,30 @@ EXIT:</div>
<div> return EFI_SUCCESS;</div>
<div> }</div>
<div> </div>
<div>+/**</div>
<div>+ Performs Exit Boot Services UserAuthentication actions</div>
<div>+</div>
<div>+ @param[in] Protocol Points to the protocol's unique identifier.</div>
<div>+ @param[in] Interface Points to the interface instance.</div>
<div>+ @param[in] Handle The handle on which the interface was installed.</div>
<div>+</div>
<div>+ @retval EFI_SUCCESS Notification runs successfully.</div>
<div>+**/</div>
<div>+EFI_STATUS</div>
<div>+EFIAPI</div>
<div>+UaExitBootServices (</div>
<div>+ IN CONST EFI_GUID *Protocol,</div>
<div>+ IN VOID *Interface,</div>
<div>+ IN EFI_HANDLE Handle</div>
<div>+ )</div>
<div>+{</div>
<div>+ DEBUG ((DEBUG_INFO, "Unregister User Authentication Smi\n"));</div>
<div>+</div>
<div>+ gSmst->SmiHandlerUnRegister(mSmmHandle);</div>
<div>+</div>
<div>+ return EFI_SUCCESS;</div>
<div>+}</div>
<div>+</div>
<div> /**</div>
<div> Main entry for this driver.</div>
<div> </div>
<div>@@ -633,6 +658,7 @@ PasswordSmmInit (</div>
<div> EDKII_VARIABLE_LOCK_PROTOCOL *VariableLock;</div>
<div> CHAR16 PasswordHistoryName[sizeof(USER_AUTHENTICATION_VAR_NAME)/sizeof(CHAR16) + 5];</div>
<div> UINTN Index;</div>
<div>+ EFI_EVENT ExitBootServicesEvent;</div>
<div> </div>
<div> ASSERT (PASSWORD_HASH_SIZE == SHA256_DIGEST_SIZE);</div>
<div> ASSERT (PASSWORD_HISTORY_CHECK_COUNT < 0xFFFF);</div>
<div>@@ -663,6 +689,14 @@ PasswordSmmInit (</div>
<div> if (EFI_ERROR (Status)) {</div>
<div> return Status;</div>
<div> }</div>
<div>+ mSmmHandle = SmmHandle;</div>
<div>+ //</div>
<div>+ // Register for SmmExitBootServices and SmmLegacyBoot notification.</div>
<div>+ //</div>
<div>+ Status = gSmst->SmmRegisterProtocolNotify (&gEdkiiSmmExitBootServicesProtocolGuid, UaExitBootServices, &ExitBootServicesEvent);</div>
<div>+ ASSERT_EFI_ERROR (Status);</div>
<div>+ Status = gSmst->SmmRegisterProtocolNotify (&gEdkiiSmmLegacyBootProtocolGuid, UaExitBootServices, &ExitBootServicesEvent);</div>
<div>+ ASSERT_EFI_ERROR (Status);</div>
<div> </div>
<div> if (IsPasswordCleared()) {</div>
<div> DEBUG ((DEBUG_INFO, "IsPasswordCleared\n"));</div>
<div>diff --git a/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationSmm.inf b/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationSmm.inf</div>
<div>index 0b33b194..d73a2fe2 100644</div>
<div>--- a/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationSmm.inf</div>
<div>+++ b/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationSmm.inf</div>
<div>@@ -48,6 +48,8 @@</div>
<div> [Protocols]</div>
<div> gEdkiiVariableLockProtocolGuid ## CONSUMES</div>
<div> gEfiSmmVariableProtocolGuid ## CONSUMES</div>
<div>+ gEdkiiSmmExitBootServicesProtocolGuid ## CONSUMES</div>
<div>+ gEdkiiSmmLegacyBootProtocolGuid ## CONSUMES</div>
<div> </div>
<div> [Depex]</div>
<div> gEfiSmmVariableProtocolGuid AND gEfiVariableWriteArchProtocolGuid</div>
<div>-- </div>
<div>2.26.2.windows.1</div>
<div> </div>
<div width="1" style="color:white;clear:both">_._,_._,_</div> <hr> Groups.io Links:<p> You receive all messages sent to this group. <p> <a target="_blank" href="https://edk2.groups.io/g/devel/message/81045">View/Reply Online (#81045)</a> | | <a target="_blank" href="https://groups.io/mt/85815442/1813853">Mute This Topic</a> | <a href="https://edk2.groups.io/g/devel/post">New Topic</a><br> <a href="https://edk2.groups.io/g/devel/editsub/1813853">Your Subscription</a> | <a href="mailto:devel+owner@edk2.groups.io">Contact Group Owner</a> | <a href="https://edk2.groups.io/g/devel/unsub">Unsubscribe</a> [edk2-devel-archive@redhat.com]<br> <div width="1" style="color:white;clear:both">_._,_._,_</div>