libpldmresponder: fix a potential pldm crash
In the current state, pldm does create the sensor/effecter even in the
absence of the underlying dbus resource. There is a bug in the responder
code due to which we emplace an empty dbus value map into the handler
with a sensor ID. And if the remote PLDM endpoint queries for the state
of the sensor, pldm would crash since it tries to read content from the
empty dbus value map. This commit would fix the crash by adding
necessary bound checks.
Testing:
1. Unit tests passed.
2. Functionally verified the fix by giving a dummy dbus object path and
making sure that the sensor/effecter is not created & also ensured that
pldm does not crash.
Change-Id: I5fb06677f6ae1bd74f9ec741b311f59737caf79d
Signed-off-by: Manojkiran Eda <manojkiran.eda@gmail.com>
diff --git a/libpldmresponder/pdr_state_effecter.hpp b/libpldmresponder/pdr_state_effecter.hpp
index 68cfb00..17a7af9 100644
--- a/libpldmresponder/pdr_state_effecter.hpp
+++ b/libpldmresponder/pdr_state_effecter.hpp
@@ -70,7 +70,6 @@
pdr->hdr.length = pdrSize - sizeof(pldm_pdr_hdr);
pdr->terminus_handle = TERMINUS_HANDLE;
- pdr->effecter_id = handler.getNextEffecterId();
try
{
@@ -161,19 +160,22 @@
error(
"Failed to create effecter PDR, D-Bus object '{PATH}' returned {ERROR}",
"PATH", objectPath, "ERROR", e);
- continue;
+ break;
}
-
dbusMappings.emplace_back(std::move(dbusMapping));
dbusValMaps.emplace_back(std::move(dbusIdToValMap));
}
- handler.addDbusObjMaps(
- pdr->effecter_id,
- std::make_tuple(std::move(dbusMappings), std::move(dbusValMaps)));
- pldm::responder::pdr_utils::PdrEntry pdrEntry{};
- pdrEntry.data = entry.data();
- pdrEntry.size = pdrSize;
- repo.addRecord(pdrEntry);
+ if (!(dbusMappings.empty() && dbusValMaps.empty()))
+ {
+ pdr->effecter_id = handler.getNextEffecterId();
+ handler.addDbusObjMaps(pdr->effecter_id,
+ std::make_tuple(std::move(dbusMappings),
+ std::move(dbusValMaps)));
+ pldm::responder::pdr_utils::PdrEntry pdrEntry{};
+ pdrEntry.data = entry.data();
+ pdrEntry.size = pdrSize;
+ repo.addRecord(pdrEntry);
+ }
}
}