From: Amit Kumar <amit.ak@samsung.com>
To: edk2-devel@lists.01.org
Cc: feng.tian@intel.com, Amit Kumar <amit.ak@samsung.com>
Subject: [PATCH] MdeModulePkg/DxeCore: Fixed Interface returned by CoreOpenProtocol
Date: Tue, 13 Jun 2017 18:14:34 +0530 [thread overview]
Message-ID: <ed59dddb1fd4067de512c08026b5f0d7844e9f36.1497017517.git.amit.ak@samsung.com> (raw)
In-Reply-To: CGME20170613124333epcas1p2d82549b72e339e5d553b7e4ee09bfe3a@epcas1p2.samsung.com
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>
---
MdeModulePkg/Core/Dxe/Hand/Handle.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/MdeModulePkg/Core/Dxe/Hand/Handle.c b/MdeModulePkg/Core/Dxe/Hand/Handle.c
index 1c25521..0afa86b 100644
--- a/MdeModulePkg/Core/Dxe/Hand/Handle.c
+++ b/MdeModulePkg/Core/Dxe/Hand/Handle.c
@@ -1004,13 +1004,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;
//
// Check for invalid UserHandle
@@ -1073,15 +1068,11 @@ CoreOpenProtocol (
Prot = CoreGetProtocolInterface (UserHandle, Protocol);
if (Prot == NULL) {
Status = EFI_UNSUPPORTED;
+ // Return NULL Interface if Unsupported Protocal
+ *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;
@@ -1175,6 +1166,15 @@ 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 ((Attributes != EFI_OPEN_PROTOCOL_TEST_PROTOCOL)
+ && (Status == EFI_SUCCESS)) {
+ *Interface = Prot->Interface;
+ }
//
// Done. Release the database lock are return
//
--
1.9.1
next parent reply other threads:[~2017-06-13 12:42 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20170613124333epcas1p2d82549b72e339e5d553b7e4ee09bfe3a@epcas1p2.samsung.com>
2017-06-13 12:44 ` Amit Kumar [this message]
2017-06-15 7:36 ` [PATCH] MdeModulePkg/DxeCore: Fixed Interface returned by CoreOpenProtocol Gao, Liming
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=ed59dddb1fd4067de512c08026b5f0d7844e9f36.1497017517.git.amit.ak@samsung.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