commit ba3e4f5cfbd14994cf14d36f39182fa98b0459ff
author Yong Li <yong.b.li@linux.intel.com> Thu Oct 31 18:19:58 2019 +0800
committer Yong Li <yong.b.li@intel.com> Thu Nov 07 06:00:43 2019 +0000
tree 06e5bfdc21bc6994af749a36683beb240ef0bdc5
parent c88640627cde5fb0e4aa7e1799d043689775cfad

Fix the incorrect completion code for region read command

When the input data is invalid, the return code should be 0xcc,
0xc7 means the request data length is not matching with
the actual length of the request data.

Tested:
using an incorrect offset 0xff00, the command will fail with 0xcc:
ipmitool raw 0x3e 0x23 0x01 0x1 0x00 0xff
Unable to send RAW command (channel=0x0 netfn=0x3e lun=0x0 cmd=0x23 rsp=0xcc):
Invalid data field in request

Signed-off-by: Yong Li <yong.b.li@linux.intel.com>
Change-Id: Ie82fb978ca924dc64e378c8c567315f686f48059

src/smbioshandler.cpp

diff --git a/src/smbioshandler.cpp b/src/smbioshandler.cpp
index 6e3cff9..835302a 100644
--- a/src/smbioshandler.cpp
+++ b/src/smbioshandler.cpp
@@ -34,6 +34,7 @@
 constexpr const char* DBUS_PROPERTIES = "org.freedesktop.DBus.Properties";
 constexpr const char* MDRV1_PATH = "/xyz/openbmc_project/Smbios/MDR_V1";
 constexpr const char* MDRV1_INTERFACE = "xyz.openbmc_project.Smbios.MDR_V1";
+static constexpr uint8_t maxDataLen = 254;
 
 static void register_netfn_smbios_functions() __attribute__((constructor));
 
@@ -242,10 +243,17 @@
         phosphor::logging::log<level::ERR>("Error getting regionUsed");
         return IPMI_CC_UNSPECIFIED_ERROR;
     }
-    if (requestData->offset + requestData->length >
-        std::get<uint16_t>(regUsedVal))
+    if ((requestData->length >= maxDataLen) ||
+        (requestData->offset + requestData->length >
+         std::get<uint16_t>(regUsedVal)))
     {
-        return IPMI_CC_REQ_DATA_LEN_INVALID;
+        phosphor::logging::log<level::INFO>(
+            "Invalid data request",
+            phosphor::logging::entry("OFFSET=%d", requestData->offset),
+            phosphor::logging::entry("LENGTH=%d", requestData->length),
+            phosphor::logging::entry("REGUSED=%d",
+                                     std::get<uint16_t>(regUsedVal)));
+        return IPMI_CC_INVALID_FIELD_REQUEST;
     }
 
     if (0 > sdplus_mdrv1_get_property("LockPolicy", lockPolicyVal, service))
@@ -277,7 +285,7 @@
     *data_len = responseData->length = res[0];
     responseData->updateCount = res[1];
 
-    if ((*data_len == 0) || (*data_len >= 254))
+    if ((*data_len == 0) || (*data_len >= maxDataLen))
     {
         phosphor::logging::log<level::ERR>(
             "Data length send from service is invalid");