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

[meshcop] improve HandleCommissioningGet implementation (#4194)

Browse Source 
- Fix insufficient length checks.
- Avoid using a large stack buffer.
This commit is contained in:
Jonathan Hui
2019-09-20 14:39:49 +08:00
committed by GitHub
parent 4916f1c0c5
commit 8be8bf1fdf
2 changed files with 15 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/thread/network_data_leader_ftd.cpp
+13 -22
View File
@@ -286,32 +286,19 @@ void Leader::HandleCommissioningGet(void *aContext, otMessage *aMessage, const o
void Leader::HandleCommissioningGet(Coap::Message &aMessage, const Ip6::MessageInfo &aMessageInfo)
{
MeshCoP::Tlv tlv;
uint16_t offset = aMessage.GetOffset();
uint8_t tlvs[NetworkData::kMaxSize];
uint8_t length = 0;
uint16_t length = 0;
uint16_t offset;
while (offset < aMessage.GetLength())
{
aMessage.Read(offset, sizeof(tlv), &tlv);
SuccessOrExit(Tlv::GetValueOffset(aMessage, MeshCoP::Tlv::kGet, offset, length));
aMessage.SetOffset(offset);
if (tlv.GetType() == MeshCoP::Tlv::kGet)
{
length = tlv.GetLength();
aMessage.Read(offset + sizeof(MeshCoP::Tlv), length, tlvs);
break;
}
offset += sizeof(tlv) + tlv.GetLength();
}
SendCommissioningGetResponse(aMessage, aMessageInfo, tlvs, length);
exit:
SendCommissioningGetResponse(aMessage, length, aMessageInfo);
}
void Leader::SendCommissioningGetResponse(const Coap::Message & aRequest,
const Ip6::MessageInfo &aMessageInfo,
const uint8_t * aTlvs,
uint8_t aLength)
uint16_t aLength,
const Ip6::MessageInfo &aMessageInfo)
{
otError error = OT_ERROR_NONE;
Coap::Message *message;
@@ -345,10 +332,14 @@ void Leader::SendCommissioningGetResponse(const Coap::Message & aRequest,
{
for (index = 0; index < aLength; index++)
{
uint8_t type;
aRequest.Read(aRequest.GetOffset() + index, sizeof(type), &type);
for (MeshCoP::Tlv *cur = reinterpret_cast<MeshCoP::Tlv *>(data);
cur < reinterpret_cast<MeshCoP::Tlv *>(data + length); cur = cur->GetNext())
{
if (cur->GetType() == aTlvs[index])
if (cur->GetType() == type)
{
SuccessOrExit(error = message->AppendTlv(*cur));
break;
src/core/thread/network_data_leader_ftd.hpp
+2 -3
View File
@@ -225,9 +225,8 @@ private:
void HandleCommissioningGet(Coap::Message &aMessage, const Ip6::MessageInfo &aMessageInfo);
void SendCommissioningGetResponse(const Coap::Message & aRequest,
const Ip6::MessageInfo &aMessageInfo,
const uint8_t * aTlvs,
uint8_t aLength);
uint16_t aLength,
const Ip6::MessageInfo &aMessageInfo);
void SendCommissioningSetResponse(const Coap::Message & aRequest,
const Ip6::MessageInfo & aMessageInfo,
MeshCoP::StateTlv::State aState);