summaryrefslogtreecommitdiffstats
path: root/SecurityPkg
diff options
context:
space:
mode:
authorEric Dong <eric.dong@intel.com>2016-04-06 12:54:11 +0800
committerRuiyu Ni <ruiyu.ni@intel.com>2016-04-06 13:03:15 +0800
commit59ed6433dd84798da6a17366700b057218c04a3a (patch)
tree40415ae5be21bae163a2afff09d72c98ce248679 /SecurityPkg
parentb4ddf0eb49f7ee41c075b69ed69557f8fa3d5b85 (diff)
downloadedk2-59ed6433dd84798da6a17366700b057218c04a3a.tar.gz
edk2-59ed6433dd84798da6a17366700b057218c04a3a.tar.bz2
edk2-59ed6433dd84798da6a17366700b057218c04a3a.zip
SecurityPkg TcgStorageOpalLib: Fixed gcc build failure.
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Eric Dong <eric.dong@intel.com> Reviewed-by: Feng Tian <feng.tian@intel.com>
Diffstat (limited to 'SecurityPkg')
-rw-r--r--SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalCore.c2
-rw-r--r--SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalUtil.c7
2 files changed, 5 insertions, 4 deletions
diff --git a/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalCore.c b/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalCore.c
index 234909b13b..2db5ffeba9 100644
--- a/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalCore.c
+++ b/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalCore.c
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
-#include <uefi.h>
+#include <Uefi.h>
#include <Library/BaseLib.h>
#include <Library/TimerLib.h>
#include <Library/BaseMemoryLib.h>
diff --git a/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalUtil.c b/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalUtil.c
index 2d3ecb474c..d27a9c9b5f 100644
--- a/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalUtil.c
+++ b/SecurityPkg/Library/TcgStorageOpalLib/TcgStorageOpalUtil.c
@@ -11,7 +11,7 @@ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
-#include <uefi.h>
+#include <Uefi.h>
#include <Library/BaseLib.h>
#include <Library/DebugLib.h>
#include <Library/TcgStorageOpalLib.h>
@@ -853,8 +853,9 @@ OpalUtilDetermineOwnership(
TCG_RESULT Ret;
OPAL_OWNER_SHIP Owner;
- NULL_CHECK(Session);
- NULL_CHECK(Msid);
+ if ((Session == NULL) || (Msid == NULL)) {
+ return OpalOwnershipUnknown;
+ }
Owner = OpalOwnershipUnknown;
//