espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-07-27 14:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[network-data] check and skip over incomplete TLVs during TLV iteration (#6477)

Browse Source 
This commit updates `NetworkData::Iterate()` to check that an entire
TLV (or sub-TLV) is contained within the Network Data (up to its
length) and skips over TLVs that are incomplete. It also updates
`FindTlv()` methods to directly use the stricter check in the
`for()` loop used to iterate over all TLVs.
This commit is contained in:
Abtin Keshavarzian
2021-04-19 21:19:08 -07:00
committed by GitHub
parent 3e05438d32
commit 31cbb28d84
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/thread/network_data.cpp
+7 -8
View File
@@ -131,10 +131,8 @@ const NetworkDataTlv *NetworkData::FindTlv(const NetworkDataTlv *aStart,
{
const NetworkDataTlv *tlv;
for (tlv = aStart; tlv < aEnd; tlv = tlv->GetNext())
for (tlv = aStart; (tlv + 1 <= aEnd) && (tlv->GetNext() <= aEnd); tlv = tlv->GetNext())
{
VerifyOrExit((tlv + 1) <= aEnd && tlv->GetNext() <= aEnd, tlv = nullptr);
if (tlv->GetType() == aType)
{
ExitNow();
@@ -154,10 +152,8 @@ const NetworkDataTlv *NetworkData::FindTlv(const NetworkDataTlv *aStart,
{
const NetworkDataTlv *tlv;
for (tlv = aStart; tlv < aEnd; tlv = tlv->GetNext())
for (tlv = aStart; (tlv + 1 <= aEnd) && (tlv->GetNext() <= aEnd); tlv = tlv->GetNext())
{
VerifyOrExit((tlv + 1) <= aEnd && tlv->GetNext() <= aEnd, tlv = nullptr);
if ((tlv->GetType() == aType) && (tlv->IsStable() == aStable))
{
ExitNow();
@@ -252,7 +248,9 @@ Error NetworkData::Iterate(Iterator &aIterator, uint16_t aRloc16, Config &aConfi
Error error = kErrorNotFound;
NetworkDataIterator iterator(aIterator);
for (const NetworkDataTlv *cur; (cur = iterator.GetTlv(mTlvs)) < GetTlvsEnd(); iterator.AdvanceTlv(mTlvs))
for (const NetworkDataTlv *cur;
cur = iterator.GetTlv(mTlvs), (cur + 1 <= GetTlvsEnd()) && (cur->GetNext() <= GetTlvsEnd());
iterator.AdvanceTlv(mTlvs))
{
const NetworkDataTlv *subTlvs = nullptr;
@@ -279,7 +277,8 @@ Error NetworkData::Iterate(Iterator &aIterator, uint16_t aRloc16, Config &aConfi
continue;
}
for (const NetworkDataTlv *subCur; (subCur = iterator.GetSubTlv(subTlvs)) < cur->GetNext();
for (const NetworkDataTlv *subCur; subCur = iterator.GetSubTlv(subTlvs),
(subCur + 1 <= cur->GetNext()) && (subCur->GetNext() <= cur->GetNext());
iterator.AdvaceSubTlv(subTlvs))
{
if (cur->GetType() == NetworkDataTlv::kTypePrefix)