commit 8241b340fe332b9698829d410ac4a7852e146989
author John Wang <wangzqbj@inspur.com> Fri Jun 05 10:49:17 2020 +0800
committer John Wang <wangzqbj@inspur.com> Fri Jun 05 15:10:34 2020 +0800
tree 07ac830fcfacaf6a947f2802f213908b9b1707e8
parent d6631b40801f56e06301f764f9f2b17cbe4ee9ff

bios: check the attribute value to update

Check the attribute value to update according
to the configuration from attribute table

Signed-off-by: John Wang <wangzqbj@inspur.com>
Change-Id: I7a1e8a6ede33bc536dcb76081a88d47185919eea

libpldmresponder/bios_config.cpp

diff --git a/libpldmresponder/bios_config.cpp b/libpldmresponder/bios_config.cpp
index e50b059..c1810de 100644
--- a/libpldmresponder/bios_config.cpp
+++ b/libpldmresponder/bios_config.cpp
@@ -193,6 +193,68 @@
     }
 }
 
+int BIOSConfig::checkAttrValueToUpdate(
+    const pldm_bios_attr_val_table_entry* attrValueEntry,
+    const pldm_bios_attr_table_entry* attrEntry, Table&)
+
+{
+    auto [attrHandle, attrType] =
+        table::attribute_value::decodeHeader(attrValueEntry);
+
+    switch (attrType)
+    {
+        case PLDM_BIOS_ENUMERATION:
+        {
+            auto value =
+                table::attribute_value::decodeEnumEntry(attrValueEntry);
+            auto [pvHdls, defIndex] =
+                table::attribute::decodeEnumEntry(attrEntry);
+            assert(value.size() == 1);
+            if (value[0] >= pvHdls.size())
+            {
+                std::cerr << "Enum: Illgeal index, Index = " << (int)value[0]
+                          << std::endl;
+                return PLDM_ERROR_INVALID_DATA;
+            }
+
+            return PLDM_SUCCESS;
+        }
+        case PLDM_BIOS_INTEGER:
+        {
+            auto value =
+                table::attribute_value::decodeIntegerEntry(attrValueEntry);
+            auto [lower, upper, scalar, def] =
+                table::attribute::decodeIntegerEntry(attrEntry);
+
+            if (value < lower || value > upper)
+            {
+                std::cerr << "Integer: out of bound, value = " << value
+                          << std::endl;
+                return PLDM_ERROR_INVALID_DATA;
+            }
+            return PLDM_SUCCESS;
+        }
+        case PLDM_BIOS_STRING:
+        {
+            auto stringConf = table::attribute::decodeStringEntry(attrEntry);
+            auto value =
+                table::attribute_value::decodeStringEntry(attrValueEntry);
+            if (value.size() < stringConf.minLength ||
+                value.size() > stringConf.maxLength)
+            {
+                std::cerr << "String: Length error, string = " << value
+                          << " length = " << value.size() << std::endl;
+                return PLDM_ERROR_INVALID_LENGTH;
+            }
+            return PLDM_SUCCESS;
+        }
+        default:
+            std::cerr << "ReadOnly or Unspported type, type = " << attrType
+                      << std::endl;
+            return PLDM_ERROR;
+    };
+}
+
 int BIOSConfig::setAttrValue(const void* entry, size_t size)
 {
     auto attrValueTable = getBIOSTable(PLDM_BIOS_ATTR_VAL_TABLE);
@@ -203,13 +265,6 @@
         return PLDM_BIOS_TABLE_UNAVAILABLE;
     }
 
-    auto destTable =
-        table::attribute_value::updateTable(*attrValueTable, entry, size);
-
-    if (!destTable)
-    {
-        return PLDM_ERROR;
-    }
     auto attrValueEntry =
         reinterpret_cast<const pldm_bios_attr_val_table_entry*>(entry);
 
@@ -222,6 +277,20 @@
         return PLDM_ERROR;
     }
 
+    auto rc = checkAttrValueToUpdate(attrValueEntry, attrEntry, *stringTable);
+    if (rc != PLDM_SUCCESS)
+    {
+        return rc;
+    }
+
+    auto destTable =
+        table::attribute_value::updateTable(*attrValueTable, entry, size);
+
+    if (!destTable)
+    {
+        return PLDM_ERROR;
+    }
+
     try
     {
         auto attrHeader = table::attribute::decodeHeader(attrEntry);

libpldmresponder/bios_config.hpp

diff --git a/libpldmresponder/bios_config.hpp b/libpldmresponder/bios_config.hpp
index ae1794e..98734ba 100644
--- a/libpldmresponder/bios_config.hpp
+++ b/libpldmresponder/bios_config.hpp
@@ -156,6 +156,16 @@
      *  @return The table, std::nullopt if loading fails
      */
     std::optional<Table> loadTable(const fs::path& path);
+
+    /** @brief Check the attribute value to update
+     *  @param[in] attrValueEntry - The attribute value entry to update
+     *  @param[in] attrEntry - The attribute table entry
+     *  @param[in] stringTable - The string  table
+     *  @return pldm_completion_codes
+     */
+    int checkAttrValueToUpdate(
+        const pldm_bios_attr_val_table_entry* attrValueEntry,
+        const pldm_bios_attr_table_entry* attrEntry, Table& stringTable);
 };
 
 } // namespace bios