Return EFI_INVALID_PARAMETER in LocateProtocol for Protocol==NULL to follow UEFI 2.7 spec
PiSmmCore is also updated as the EFI_SMM_SYSTEM_TABLE2.SmmLocateProtocol is reusing the definition of EFI_LOCATE_PROTOCOL. Cc: Liming Gao <[email protected]> Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Star Zeng <[email protected]> --- MdeModulePkg/Core/Dxe/Hand/Locate.c | 8 ++------ MdeModulePkg/Core/PiSmmCore/Locate.c | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/MdeModulePkg/Core/Dxe/Hand/Locate.c b/MdeModulePkg/Core/Dxe/Hand/Locate.c index 80df0d4a6c1d..3cc146f3814c 100644 --- a/MdeModulePkg/Core/Dxe/Hand/Locate.c +++ b/MdeModulePkg/Core/Dxe/Hand/Locate.c @@ -1,7 +1,7 @@ /** @file Locate handle functions -Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR> +Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR> This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -560,14 +560,10 @@ CoreLocateProtocol ( PROTOCOL_NOTIFY *ProtNotify; IHANDLE *Handle; - if (Interface == NULL) { + if ((Interface == NULL) || (Protocol == NULL)) { return EFI_INVALID_PARAMETER; } - if (Protocol == NULL) { - return EFI_NOT_FOUND; - } - *Interface = NULL; Status = EFI_SUCCESS; diff --git a/MdeModulePkg/Core/PiSmmCore/Locate.c b/MdeModulePkg/Core/PiSmmCore/Locate.c index a7220bae86af..c174a4dd03b8 100644 --- a/MdeModulePkg/Core/PiSmmCore/Locate.c +++ b/MdeModulePkg/Core/PiSmmCore/Locate.c @@ -1,7 +1,7 @@ /** @file Locate handle functions - Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR> + Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR> This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -205,14 +205,10 @@ SmmLocateProtocol ( PROTOCOL_NOTIFY *ProtNotify; IHANDLE *Handle; - if (Interface == NULL) { + if ((Interface == NULL) || (Protocol == NULL)) { return EFI_INVALID_PARAMETER; } - if (Protocol == NULL) { - return EFI_NOT_FOUND; - } - *Interface = NULL; Status = EFI_SUCCESS; -- 2.7.0.windows.1 _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
