SecurityPkg OpalPasswordDxe: Check the pointer before use it.

Check the pointer before use it to make the code more safely.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Feng Tian <feng.tian@intel.com>

diff --git a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHii.c b/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHii.c
index 250cb438e94f39934adad3ba5140fdb54074fdeb..eb7d59b52c2a0da7e89aa5750d5a46079fc6b085 100644 (file)
--- a/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHii.c
+++ b/SecurityPkg/Tcg/Opal/OpalPasswordDxe/OpalHii.c
@@ -435,12 +435,12 @@ GetDiskNameStringId(
 EFI_STATUS\r
 EFIAPI\r
 DriverCallback(\r
-  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL*   This,\r
+  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL    *This,\r
   EFI_BROWSER_ACTION                      Action,\r
   EFI_QUESTION_ID                         QuestionId,\r
   UINT8                                   Type,\r
-  EFI_IFR_TYPE_VALUE*                     Value,\r
-  EFI_BROWSER_ACTION_REQUEST*             ActionRequest\r
+  EFI_IFR_TYPE_VALUE                      *Value,\r
+  EFI_BROWSER_ACTION_REQUEST              *ActionRequest\r
   )\r
 {\r
   HII_KEY    HiiKey;\r
@@ -448,6 +448,8 @@ DriverCallback(
 \r
   if (ActionRequest != NULL) {\r
     *ActionRequest = EFI_BROWSER_ACTION_REQUEST_NONE;\r
+  } else {\r
+    return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   //\r
@@ -644,14 +646,13 @@ HiiPsidRevert(
 \r
   UnicodeStrToAsciiStr(gHiiConfiguration.Psid, (CHAR8*)Psid.Psid);\r
 \r
-  OpalDisk = HiiGetOpalDiskCB(gHiiConfiguration.SelectedDiskIndex);\r
-\r
-  ZeroMem(&Session, sizeof(Session));\r
-  Session.Sscp = OpalDisk->Sscp;\r
-  Session.MediaId = OpalDisk->MediaId;\r
-  Session.OpalBaseComId = OpalDisk->OpalBaseComId;\r
-\r
+  OpalDisk = HiiGetOpalDiskCB (gHiiConfiguration.SelectedDiskIndex);\r
   if (OpalDisk != NULL) {\r
+    ZeroMem(&Session, sizeof(Session));\r
+    Session.Sscp = OpalDisk->Sscp;\r
+    Session.MediaId = OpalDisk->MediaId;\r
+    Session.OpalBaseComId = OpalDisk->OpalBaseComId;\r
+\r
     Ret = OpalSupportPsidRevert(&Session, Psid.Psid, (UINT32)sizeof(Psid.Psid), OpalDisk->OpalDevicePath);\r
   }\r
 \r