Good catch! Reviewed-by: Jiewen Yao <[email protected]>
> -----Original Message----- > From: Laszlo Ersek <[email protected]> > Sent: Thursday, October 3, 2019 7:07 PM > To: Zhang, Chao B <[email protected]>; Wang, Jian J > <[email protected]>; Yao, Jiewen <[email protected]> > Cc: edk2-devel-groups-io <[email protected]> > Subject: Re: [edk2-devel] [PATCH 26/35] SecurityPkg: fix > UninstallMultipleProtocolInterfaces() calls > > Pinging SecurityPkg maintainers again, for reviewing this patch. > > Thanks > Laszlo > > On 09/26/19 14:45, Laszlo Ersek wrote: > > Chao, Jian, Jiewen, > > > > can you please review this patch? > > > > Thanks, > > Laszlo > > > > On 09/17/19 21:49, Laszlo Ersek wrote: > >> Unlike the InstallMultipleProtocolInterfaces() boot service, which takes > >> an (EFI_HANDLE*) as first parameter, the > >> UninstallMultipleProtocolInterfaces() boot service takes an EFI_HANDLE as > >> first parameter. > >> > >> These are actual bugs. They must have remained hidden until now because > >> they are all in Unload() functions, which are probably exercised > >> infrequently. Fix the UninstallMultipleProtocolInterfaces() calls. > >> > >> Cc: Chao Zhang <[email protected]> > >> Cc: Jian Wang <[email protected]> > >> Cc: Jiewen Yao <[email protected]> > >> Signed-off-by: Laszlo Ersek <[email protected]> > >> --- > >> > >> Notes: > >> build-tested only > >> > >> SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDriver.c > >> | 2 +- > >> SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDriver.c > >> | 2 +- > >> > SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDri > ver.c | 2 +- > >> 3 files changed, 3 insertions(+), 3 deletions(-) > >> > >> diff --git a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDriver.c > b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDriver.c > >> index 54155a338100..9052eced757d 100644 > >> --- a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDriver.c > >> +++ b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDriver.c > >> @@ -443,7 +443,7 @@ Tcg2ConfigDriverUnload ( > >> ASSERT (PrivateData->Signature == > TCG2_CONFIG_PRIVATE_DATA_SIGNATURE); > >> > >> gBS->UninstallMultipleProtocolInterfaces ( > >> - &ImageHandle, > >> + ImageHandle, > >> &gEfiCallerIdGuid, > >> PrivateData, > >> NULL > >> diff --git a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDriver.c > b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDriver.c > >> index 341879e4c4ba..fb06624fdb8f 100644 > >> --- a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDriver.c > >> +++ b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDriver.c > >> @@ -138,7 +138,7 @@ TcgConfigDriverUnload ( > >> ASSERT (PrivateData->Signature == > TCG_CONFIG_PRIVATE_DATA_SIGNATURE); > >> > >> gBS->UninstallMultipleProtocolInterfaces ( > >> - &ImageHandle, > >> + ImageHandle, > >> &gEfiCallerIdGuid, > >> PrivateData, > >> NULL > >> diff --git > a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfig > Driver.c > b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfig > Driver.c > >> index 798ef9cfbc01..6c0294151e6c 100644 > >> --- > a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfig > Driver.c > >> +++ > b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfig > Driver.c > >> @@ -115,7 +115,7 @@ SecureBootConfigDriverUnload ( > >> ASSERT (PrivateData->Signature == > SECUREBOOT_CONFIG_PRIVATE_DATA_SIGNATURE); > >> > >> gBS->UninstallMultipleProtocolInterfaces ( > >> - &ImageHandle, > >> + ImageHandle, > >> &gEfiCallerIdGuid, > >> PrivateData, > >> NULL > >> > > > > > > > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#48465): https://edk2.groups.io/g/devel/message/48465 Mute This Topic: https://groups.io/mt/34180228/21656 Group Owner: [email protected] Unsubscribe: https://edk2.groups.io/g/devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
