diff options
| author | Amit Kumar <amit.ak@samsung.com> | 2017-06-23 18:09:47 +0800 |
|---|---|---|
| committer | Star Zeng <star.zeng@intel.com> | 2017-06-26 10:45:33 +0800 |
| commit | 45cfcd8dccf84b8abbc1d6f587fedb5d2037ec79 (patch) | |
| tree | 9408d05aca11c27c475aabc8222054562410270f | |
| parent | 578dbd52b70061fd3442dc5b050479e4f13b9585 (diff) | |
| download | edk2-45cfcd8dccf84b8abbc1d6f587fedb5d2037ec79.tar.gz edk2-45cfcd8dccf84b8abbc1d6f587fedb5d2037ec79.tar.bz2 edk2-45cfcd8dccf84b8abbc1d6f587fedb5d2037ec79.zip | |
MdeModulePkg/DxeCore: Fixed Interface returned by CoreOpenProtocol
Change since v3:
1) Fixed issue when Attributes = EFI_OPEN_PROTOCOL_TEST_PROTOCOL
and Inteface = NULL case. [Reported by:star.zeng at intel.com]
Change Since v2:
1) Modified to use EFI_ERROR to get status code
Change since v1:
1) Fixed typo protocal to protocol
2) Fixed coding style
Modified source code to update Interface as per spec.
1) In case of Protocol is un-supported, interface should be returned NULL.
2) In case of any error, interface should not be modified.
3) In case of Test Protocol, interface is optional.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Amit Kumar <amit.ak@samsung.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
| -rw-r--r-- | MdeModulePkg/Core/Dxe/Hand/Handle.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/MdeModulePkg/Core/Dxe/Hand/Handle.c b/MdeModulePkg/Core/Dxe/Hand/Handle.c index 59b89148c8..fe58b6c583 100644 --- a/MdeModulePkg/Core/Dxe/Hand/Handle.c +++ b/MdeModulePkg/Core/Dxe/Hand/Handle.c @@ -1006,12 +1006,8 @@ CoreOpenProtocol ( //
// Check for invalid Interface
//
- if (Attributes != EFI_OPEN_PROTOCOL_TEST_PROTOCOL) {
- if (Interface == NULL) {
- return EFI_INVALID_PARAMETER;
- } else {
- *Interface = NULL;
- }
+ if ((Attributes != EFI_OPEN_PROTOCOL_TEST_PROTOCOL) && (Interface == NULL)) {
+ return EFI_INVALID_PARAMETER;
}
//
@@ -1075,15 +1071,13 @@ CoreOpenProtocol ( Prot = CoreGetProtocolInterface (UserHandle, Protocol);
if (Prot == NULL) {
Status = EFI_UNSUPPORTED;
+ if (Attributes != EFI_OPEN_PROTOCOL_TEST_PROTOCOL){
+ //Return NULL Interface if Unsupported Protocol
+ *Interface = NULL;
+ }
goto Done;
}
- //
- // This is the protocol interface entry for this protocol
- //
- if (Attributes != EFI_OPEN_PROTOCOL_TEST_PROTOCOL) {
- *Interface = Prot->Interface;
- }
Status = EFI_SUCCESS;
ByDriver = FALSE;
@@ -1177,6 +1171,14 @@ CoreOpenProtocol ( }
Done:
+
+ //
+ // This is the protocol interface entry for this protocol.
+ // In case of any Error, Interface should not be updated as per spec.
+ //
+ if (!EFI_ERROR (Status) && (Attributes != EFI_OPEN_PROTOCOL_TEST_PROTOCOL)) {
+ *Interface = Prot->Interface;
+ }
//
// Done. Release the database lock are return
//
|