NetworkPkg/IScsiDxe: assert that IScsiBinToHex() always succeeds

IScsiBinToHex() is called for encoding:

- the answer to the target's challenge; that is, CHAP_R;

- the challenge for the target, in case mutual authentication is enabled;
  that is, CHAP_C.

The initiator controls the size of both blobs, the sizes of their hex
encodings are correctly calculated in "RspLen" and "ChallengeLen".
Therefore the IScsiBinToHex() calls never fail; assert that.

Cc: Jiaxin Wu <jiaxin.wu@intel.com>
Cc: Maciej Rabeda <maciej.rabeda@linux.intel.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: Siyuan Fu <siyuan.fu@intel.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3356
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Maciej Rabeda <maciej.rabeda@linux.intel.com>
Message-Id: <20210608121259.32451-7-lersek@redhat.com>

diff --git a/NetworkPkg/IScsiDxe/IScsiCHAP.c b/NetworkPkg/IScsiDxe/IScsiCHAP.c
index 9e192ce292e87ecce296df12b81ea3819d721dce..dbe3c8ef46f9743b854f6991a7f35d8f9f49bd67 100644 (file)
--- a/NetworkPkg/IScsiDxe/IScsiCHAP.c
+++ b/NetworkPkg/IScsiDxe/IScsiCHAP.c
@@ -391,6 +391,7 @@ IScsiCHAPToSendReq (
   UINT32                      RspLen;\r
   CHAR8                       *Challenge;\r
   UINT32                      ChallengeLen;\r
+  EFI_STATUS                  BinToHexStatus;\r
 \r
   ASSERT (Conn->CurrentStage == ISCSI_SECURITY_NEGOTIATION);\r
 \r
@@ -471,12 +472,13 @@ IScsiCHAPToSendReq (
     //\r
     // CHAP_R=<R>\r
     //\r
-    IScsiBinToHex (\r
-      (UINT8 *) AuthData->CHAPResponse,\r
-      ISCSI_CHAP_RSP_LEN,\r
-      Response,\r
-      &RspLen\r
-      );\r
+    BinToHexStatus = IScsiBinToHex (\r
+                       (UINT8 *) AuthData->CHAPResponse,\r
+                       ISCSI_CHAP_RSP_LEN,\r
+                       Response,\r
+                       &RspLen\r
+                       );\r
+    ASSERT_EFI_ERROR (BinToHexStatus);\r
     IScsiAddKeyValuePair (Pdu, ISCSI_KEY_CHAP_RESPONSE, Response);\r
 \r
     if (AuthData->AuthConfig->CHAPType == ISCSI_CHAP_MUTUAL) {\r
@@ -490,12 +492,13 @@ IScsiCHAPToSendReq (
       // CHAP_C=<C>\r
       //\r
       IScsiGenRandom ((UINT8 *) AuthData->OutChallenge, ISCSI_CHAP_RSP_LEN);\r
-      IScsiBinToHex (\r
-        (UINT8 *) AuthData->OutChallenge,\r
-        ISCSI_CHAP_RSP_LEN,\r
-        Challenge,\r
-        &ChallengeLen\r
-        );\r
+      BinToHexStatus = IScsiBinToHex (\r
+                         (UINT8 *) AuthData->OutChallenge,\r
+                         ISCSI_CHAP_RSP_LEN,\r
+                         Challenge,\r
+                         &ChallengeLen\r
+                         );\r
+      ASSERT_EFI_ERROR (BinToHexStatus);\r
       IScsiAddKeyValuePair (Pdu, ISCSI_KEY_CHAP_CHALLENGE, Challenge);\r
 \r
       Conn->AuthStep = ISCSI_CHAP_STEP_FOUR;\r