commit 83a644cbaf27e26e4949dbfef15d325fff83aaff
author Tom Joseph <rushtotom@gmail.com> Tue Jun 22 22:25:25 2021 -0700
committer Tom Joseph <rushtotom@gmail.com> Tue Jun 29 15:08:16 2021 +0000
tree 845f568821524bd8c5a8e86722310ae2891b869a
parent 8fb11c9739576fb53344427c5c422518f2a1acb4

libpldm: Fix validation in decode_get_firmware_parameters_resp

If the completion code is not PLDM_SUCCESS, typically the payload
just has the completion code. Correct the validation checks to
address this.

Tested: Updated the test cases and tests passed.

Signed-off-by: Tom Joseph <rushtotom@gmail.com>
Change-Id: I27f67c070140693ec0c60f8d79fa2fff96b3cc93

libpldm/tests/libpldm_firmware_update_test.cpp

diff --git a/libpldm/tests/libpldm_firmware_update_test.cpp b/libpldm/tests/libpldm_firmware_update_test.cpp
index ca2b1a4..bb47742 100644
--- a/libpldm/tests/libpldm_firmware_update_test.cpp
+++ b/libpldm/tests/libpldm_firmware_update_test.cpp
@@ -1051,10 +1051,8 @@
 

 TEST(GetFirmwareParameters, decodeResponseErrorCompletionCode)

 {

-    constexpr std::array<uint8_t,

-                         hdrSize + sizeof(pldm_get_firmware_parameters_resp)>

-        getFwParamsResponse{0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,

-                            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};

+    constexpr std::array<uint8_t, hdrSize + sizeof(uint8_t)>

+        getFwParamsResponse{0x00, 0x00, 0x00, 0x01};

 

     auto responseMsg =

         reinterpret_cast<const pldm_msg*>(getFwParamsResponse.data());

@@ -1088,39 +1086,45 @@
     variable_field outCompParameterTable{};

 

     rc = decode_get_firmware_parameters_resp(

-        nullptr, invalidGetFwParamsResponse1.size(), &outResp,

+        nullptr, invalidGetFwParamsResponse1.size() - hdrSize, &outResp,

         &outActiveCompImageSetVersion, &outPendingCompImageSetVersion,

         &outCompParameterTable);

     EXPECT_EQ(rc, PLDM_ERROR_INVALID_DATA);

 

     rc = decode_get_firmware_parameters_resp(

-        responseMsg, invalidGetFwParamsResponse1.size(), nullptr,

+        responseMsg, invalidGetFwParamsResponse1.size() - hdrSize, nullptr,

         &outActiveCompImageSetVersion, &outPendingCompImageSetVersion,

         &outCompParameterTable);

     EXPECT_EQ(rc, PLDM_ERROR_INVALID_DATA);

 

     rc = decode_get_firmware_parameters_resp(

-        responseMsg, invalidGetFwParamsResponse1.size(), &outResp, nullptr,

-        &outPendingCompImageSetVersion, &outCompParameterTable);

+        responseMsg, invalidGetFwParamsResponse1.size() - hdrSize, &outResp,

+        nullptr, &outPendingCompImageSetVersion, &outCompParameterTable);

     EXPECT_EQ(rc, PLDM_ERROR_INVALID_DATA);

 

     rc = decode_get_firmware_parameters_resp(

-        responseMsg, invalidGetFwParamsResponse1.size(), &outResp,

+        responseMsg, invalidGetFwParamsResponse1.size() - hdrSize, &outResp,

         &outActiveCompImageSetVersion, nullptr, &outCompParameterTable);

     EXPECT_EQ(rc, PLDM_ERROR_INVALID_DATA);

 

     rc = decode_get_firmware_parameters_resp(

-        responseMsg, invalidGetFwParamsResponse1.size(), &outResp,

+        responseMsg, invalidGetFwParamsResponse1.size() - hdrSize, &outResp,

         &outActiveCompImageSetVersion, &outPendingCompImageSetVersion, nullptr);

     EXPECT_EQ(rc, PLDM_ERROR_INVALID_DATA);

 

     rc = decode_get_firmware_parameters_resp(

         responseMsg, 0, &outResp, &outActiveCompImageSetVersion,

         &outPendingCompImageSetVersion, &outCompParameterTable);

+    EXPECT_EQ(rc, PLDM_ERROR_INVALID_DATA);

+

+    rc = decode_get_firmware_parameters_resp(

+        responseMsg, invalidGetFwParamsResponse1.size() - 1 - hdrSize, &outResp,

+        &outActiveCompImageSetVersion, &outPendingCompImageSetVersion,

+        &outCompParameterTable);

     EXPECT_EQ(rc, PLDM_ERROR_INVALID_LENGTH);

 

     rc = decode_get_firmware_parameters_resp(

-        responseMsg, invalidGetFwParamsResponse1.size(), &outResp,

+        responseMsg, invalidGetFwParamsResponse1.size() - hdrSize, &outResp,

         &outActiveCompImageSetVersion, &outPendingCompImageSetVersion,

         &outCompParameterTable);

     EXPECT_EQ(rc, PLDM_ERROR_INVALID_DATA);

@@ -1132,7 +1136,7 @@
     responseMsg =

         reinterpret_cast<const pldm_msg*>(invalidGetFwParamsResponse2.data());

     rc = decode_get_firmware_parameters_resp(

-        responseMsg, invalidGetFwParamsResponse2.size(), &outResp,

+        responseMsg, invalidGetFwParamsResponse2.size() - hdrSize, &outResp,

         &outActiveCompImageSetVersion, &outPendingCompImageSetVersion,

         &outCompParameterTable);

     EXPECT_EQ(rc, PLDM_ERROR_INVALID_DATA);

@@ -1145,7 +1149,7 @@
     responseMsg =

         reinterpret_cast<const pldm_msg*>(invalidGetFwParamsResponse3.data());

     rc = decode_get_firmware_parameters_resp(

-        responseMsg, invalidGetFwParamsResponse3.size(), &outResp,

+        responseMsg, invalidGetFwParamsResponse3.size() - hdrSize, &outResp,

         &outActiveCompImageSetVersion, &outPendingCompImageSetVersion,

         &outCompParameterTable);

     EXPECT_EQ(rc, PLDM_ERROR_INVALID_DATA);

@@ -1158,7 +1162,7 @@
     responseMsg =

         reinterpret_cast<const pldm_msg*>(invalidGetFwParamsResponse4.data());

     rc = decode_get_firmware_parameters_resp(

-        responseMsg, invalidGetFwParamsResponse4.size(), &outResp,

+        responseMsg, invalidGetFwParamsResponse4.size() - hdrSize, &outResp,

         &outActiveCompImageSetVersion, &outPendingCompImageSetVersion,

         &outCompParameterTable);

     EXPECT_EQ(rc, PLDM_ERROR_INVALID_DATA);

@@ -1170,7 +1174,7 @@
     responseMsg =

         reinterpret_cast<const pldm_msg*>(invalidGetFwParamsResponse5.data());

     rc = decode_get_firmware_parameters_resp(

-        responseMsg, invalidGetFwParamsResponse5.size(), &outResp,

+        responseMsg, invalidGetFwParamsResponse5.size() - hdrSize, &outResp,

         &outActiveCompImageSetVersion, &outPendingCompImageSetVersion,

         &outCompParameterTable);

     EXPECT_EQ(rc, PLDM_ERROR_INVALID_LENGTH);