From: "Dandan Bi" <dandan.bi@intel.com>
To: "Shi, Hao" <hao.shi@intel.com>,
"devel@edk2.groups.io" <devel@edk2.groups.io>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Subject: Re: [PATCH] UserAuthFeaturePkg/UserAuthenticationDxeSmm: The SMI to handle the user authentication should be unregister before booting to OS
Date: Mon, 27 Sep 2021 11:58:19 +0000 [thread overview]
Message-ID: <DM4PR11MB54536BF61D4FDFC4D1B7D68CEAA79@DM4PR11MB5453.namprd11.prod.outlook.com> (raw)
In-Reply-To: <20210923040138.1960-1-hao.shi@intel.com>
Hi Hao,
Some minor comments below. Please check inline.
Thanks,
Dandan
> -----Original Message-----
> From: Shi, Hao <hao.shi@intel.com>
> Sent: Thursday, September 23, 2021 12:02 PM
> To: devel@edk2.groups.io
> Cc: Shi, Hao <hao.shi@intel.com>; Bi, Dandan <dandan.bi@intel.com>
> Subject: [PATCH] UserAuthFeaturePkg/UserAuthenticationDxeSmm: The
> SMI to handle the user authentication should be unregister before booting
> to OS
>
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3648
>
> Register SmmExitBootServices and SmmLegacyBoot callback function to
> unregister this handler.
>
> Signed-off-by: Hao Shi <hao.shi@intel.com>
>
> ---
> .../UserAuthenticationSmm.c | 34 +++++++++++++++++++
> .../UserAuthenticationSmm.inf | 2 ++
> 2 files changed, 36 insertions(+)
>
> diff --git
> a/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDx
> eSmm/UserAuthenticationSmm.c
> b/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDx
> eSmm/UserAuthenticationSmm.c
> index 07e834eb..30f889dd 100644
> ---
> a/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDx
> eSmm/UserAuthenticationSmm.c
> +++
> b/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthentication
> +++ DxeSmm/UserAuthenticationSmm.c
> @@ -13,6 +13,7 @@ UINTN mAdminPasswordTryCount = 0;
>
> BOOLEAN mNeedReVerify = TRUE;
> BOOLEAN mPasswordVerified = FALSE;
> +EFI_HANDLE mSmmHandle = NULL;
>
> /**
> Verify if the password is correct.
> @@ -612,6 +613,30 @@ EXIT:
> return EFI_SUCCESS;
> }
>
> +/**
> + Performs Exit Boot Services UserAuthentication actions
> +
> + @param[in] Protocol Points to the protocol's unique identifier.
> + @param[in] Interface Points to the interface instance.
> + @param[in] Handle The handle on which the interface was installed.
> +
> + @retval EFI_SUCCESS Notification runs successfully.
> +**/
> +EFI_STATUS
> +EFIAPI
> +UaExitBootServices (
> + IN CONST EFI_GUID *Protocol,
> + IN VOID *Interface,
> + IN EFI_HANDLE Handle
> + )
> +{
> + DEBUG ((DEBUG_INFO, "Unregister User Authentication Smi\n"));
> +
> + gSmst->SmiHandlerUnRegister(mSmmHandle);
> +
> + return EFI_SUCCESS;
> +}
> +
> /**
> Main entry for this driver.
>
> @@ -633,6 +658,7 @@ PasswordSmmInit (
> EDKII_VARIABLE_LOCK_PROTOCOL *VariableLock;
> CHAR16
> PasswordHistoryName[sizeof(USER_AUTHENTICATION_VAR_NAME)/sizeof(
> CHAR16) + 5];
> UINTN Index;
> + EFI_EVENT ExitBootServicesEvent;
Please take care the alignment between new added code and old ones.
>
> ASSERT (PASSWORD_HASH_SIZE == SHA256_DIGEST_SIZE);
> ASSERT (PASSWORD_HISTORY_CHECK_COUNT < 0xFFFF); @@ -663,6
> +689,14 @@ PasswordSmmInit (
> if (EFI_ERROR (Status)) {
> return Status;
> }
> + mSmmHandle = SmmHandle;
Could we only use one global variable for register and unregister? Then can remove this statement.
> + //
> + // Register for SmmExitBootServices and SmmLegacyBoot notification.
> + //
> + Status = gSmst->SmmRegisterProtocolNotify
> + (&gEdkiiSmmExitBootServicesProtocolGuid, UaExitBootServices,
> + &ExitBootServicesEvent); ASSERT_EFI_ERROR (Status); Status =
> + gSmst->SmmRegisterProtocolNotify (&gEdkiiSmmLegacyBootProtocolGuid,
> + UaExitBootServices, &ExitBootServicesEvent); ASSERT_EFI_ERROR
> + (Status);
Could we not use &ExitBootServicesEvent for these two RegisterProtocolNotify? One generic name for both or two specific names for each?
>
> if (IsPasswordCleared()) {
> DEBUG ((DEBUG_INFO, "IsPasswordCleared\n")); diff --git
> a/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDx
> eSmm/UserAuthenticationSmm.inf
> b/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDx
> eSmm/UserAuthenticationSmm.inf
> index 0b33b194..d73a2fe2 100644
> ---
> a/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDx
> eSmm/UserAuthenticationSmm.inf
> +++
> b/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthentication
> +++ DxeSmm/UserAuthenticationSmm.inf
> @@ -48,6 +48,8 @@
> [Protocols]
> gEdkiiVariableLockProtocolGuid ## CONSUMES
> gEfiSmmVariableProtocolGuid ## CONSUMES
> + gEdkiiSmmExitBootServicesProtocolGuid ## CONSUMES
> + gEdkiiSmmLegacyBootProtocolGuid ## CONSUMES
>
> [Depex]
> gEfiSmmVariableProtocolGuid AND gEfiVariableWriteArchProtocolGuid
> --
> 2.26.2.windows.1
next prev parent reply other threads:[~2021-09-27 11:58 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-23 4:01 [PATCH] UserAuthFeaturePkg/UserAuthenticationDxeSmm: The SMI to handle the user authentication should be unregister before booting to OS hao.shi
2021-09-27 11:58 ` Dandan Bi [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-09-28 2:09 Shi, Hao
2021-10-08 1:43 ` Dandan Bi
2021-10-13 2:39 ` Dandan Bi
2021-09-23 4:42 Shi, Hao
2021-09-23 3:52 Shi, Hao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=DM4PR11MB54536BF61D4FDFC4D1B7D68CEAA79@DM4PR11MB5453.namprd11.prod.outlook.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox