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

[mesh-forwarder] disallow new message eviction in ApplyDirectTxQueueLimit() (#9348)

Browse Source 
This commit updates the `ApplyDirectTxQueueLimit()` method. We mark
the "do not evict" flag on the newly queued `aMessage` so that it
will not be removed from `RemoveAgedMessages()`. This protects
against the unlikely case where the newly queued `aMessage` may
already be aged due to execution being interrupted for a long time
between the queuing of the message in `SendMessage()` and the call to
`ApplyDirectTxQueueLimit()`. This protects against the message being
potentially removed and freed twice.
This commit is contained in:
Abtin Keshavarzian
2023-08-13 10:43:26 -07:00
committed by GitHub
parent 70adcabca6
commit 6f7767a8ae
1 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/thread/mesh_forwarder.cpp
+21 -3
View File
@@ -411,7 +411,7 @@ Error MeshForwarder::RemoveAgedMessages(void)
nextMessage = message->GetNext();
// Exclude the current message being sent `mSendMessage`.
if ((message == mSendMessage) || !message->IsDirectTransmission())
if ((message == mSendMessage) || !message->IsDirectTransmission() || message->GetDoNotEvict())
{
continue;
}
@@ -494,9 +494,27 @@ void MeshForwarder::ApplyDirectTxQueueLimit(Message &aMessage)
VerifyOrExit(IsDirectTxQueueOverMaxFrameThreshold());
#if OPENTHREAD_CONFIG_DELAY_AWARE_QUEUE_MANAGEMENT_ENABLE
if (RemoveAgedMessages() == kErrorNone)
{
VerifyOrExit(IsDirectTxQueueOverMaxFrameThreshold());
bool originalEvictFlag = aMessage.GetDoNotEvict();
Error error;
// We mark the "do not evict" flag on the new `aMessage` so
// that it will not be removed from `RemoveAgedMessages()`.
// This protects against the unlikely case where the newly
// queued `aMessage` may already be aged due to execution
// being interrupted for a long time between the queuing of
// the message and the `ApplyDirectTxQueueLimit()` call. We
// do not want the message to be potentially removed and
// freed twice.
aMessage.SetDoNotEvict(true);
error = RemoveAgedMessages();
aMessage.SetDoNotEvict(originalEvictFlag);
if (error == kErrorNone)
{
VerifyOrExit(IsDirectTxQueueOverMaxFrameThreshold());
}
}
#endif