espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-24 19:29:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

[mac-frame] fix/enhance parsing of Header IEs (#5342)

Browse Source 
This commit changes `MacFrame::FindPayloadIndex()`:

- Ensure that at least one Header IE is included when FCF indicates
  that Header IE is present.

- Detect error case where Header IE(s) are partially included.

- Handle the case where frame contains Header IE(s) but no data
  payload (spec does not require Header IE termination in this
  case).
This commit is contained in:
Abtin Keshavarzian
2020-08-05 21:30:20 -07:00
committed by GitHub
parent 36926a610a
commit 0af18a54ae
1 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/mac/mac_frame.cpp
+20 -11
View File
@@ -837,22 +837,24 @@ exit:
uint8_t Frame::FindPayloadIndex(void) const
{
uint8_t index = SkipSecurityHeaderIndex();
#if OPENTHREAD_CONFIG_MAC_HEADER_IE_SUPPORT
const uint8_t *cur = nullptr;
const uint8_t *footer = GetFooter();
#endif
VerifyOrExit(index != kInvalidIndex, OT_NOOP);
#if OPENTHREAD_CONFIG_MAC_HEADER_IE_SUPPORT
cur = GetPsdu() + index;
if (IsIePresent())
{
while (cur + sizeof(HeaderIe) <= footer)
const uint8_t *cur = &mPsdu[index];
const uint8_t *footer = GetFooter();
do
{
const HeaderIe *ie = reinterpret_cast<const HeaderIe *>(cur);
uint8_t len = static_cast<uint8_t>(ie->GetLength());
const HeaderIe *ie;
uint8_t len;
VerifyOrExit(cur + sizeof(HeaderIe) <= footer, index = kInvalidIndex);
ie = reinterpret_cast<const HeaderIe *>(cur);
len = static_cast<uint8_t>(ie->GetLength());
cur += sizeof(HeaderIe);
index += sizeof(HeaderIe);
@@ -866,11 +868,18 @@ uint8_t Frame::FindPayloadIndex(void) const
{
break;
}
}
// If `cur == footer` we exit the `while()` loop. This covers the
// case where frame contains one or more Header IEs but no data
// payload. In this case, spec does not require Header IE
// termination to be included (it is optional) since the end of
// frame can be determined from frame length and footer length.
} while (cur < footer);
// Assume no Payload IE in current implementation
}
#endif
#endif // OPENTHREAD_CONFIG_MAC_HEADER_IE_SUPPORT
// Command ID
if ((GetFrameControlField() & kFcfFrameTypeMask) == kFcfFrameMacCmd)