Skip to content

MeshService: null-check sender node before dereferencing has_user on hot RX path #10229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nightjoker7 wants to merge 5 commits into
base: develop
Choose a base branch
from
+15 −10
Open

MeshService: null-check sender node before dereferencing has_user on hot RX path #10229

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
39cf4af
MeshService: null-check sender node before dereferencing has_user on …
nightjoker7 Apr 21, 2026
2d7aa92
Merge branch 'develop' into fix/meshservice-from-node-null-deref
thebentern Apr 22, 2026
6b7fbce
Merge branch 'develop' into fix/meshservice-from-node-null-deref
thebentern Apr 23, 2026
c6e6bb2
Merge remote-tracking branch 'origin/develop' into fix/meshservice-fr…
nightjoker7 Apr 23, 2026
a6a93d2
Address Copilot review: cache getMeshNode lookup on hot RX path
nightjoker7 Apr 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions src/mesh/MeshService.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,18 +94,23 @@ int MeshService::handleFromRadio(const meshtastic_MeshPacket *mp)
mp->decoded.portnum == meshtastic_PortNum_TELEMETRY_APP && mp->decoded.request_id > 0) {
LOG_DEBUG("Received telemetry response. Skip sending our NodeInfo");
// ignore our request for its NodeInfo
} else if (mp->which_payload_variant == meshtastic_MeshPacket_decoded_tag && !nodeDB->getMeshNode(mp->from)->has_user &&
nodeInfoModule && !isPreferredRebroadcaster && !nodeDB->isFull()) {
if (airTime->isTxAllowedChannelUtil(true)) {
const int8_t hopsUsed = getHopsAway(*mp, config.lora.hop_limit);
if (hopsUsed > (int32_t)(config.lora.hop_limit + 2)) {
LOG_DEBUG("Skip send NodeInfo: %d hops away is too far away", hopsUsed);
} else if (mp->which_payload_variant == meshtastic_MeshPacket_decoded_tag && nodeInfoModule && !isPreferredRebroadcaster &&
!nodeDB->isFull()) {
// Cache the NodeDB lookup so the hot RX path does one linear scan instead of two, and
// so another task can't evict the node between the null-check and the has_user read.
meshtastic_NodeInfoLite *fromNode = nodeDB->getMeshNode(mp->from);
if (fromNode != nullptr && !fromNode->has_user) {
if (airTime->isTxAllowedChannelUtil(true)) {
const int8_t hopsUsed = getHopsAway(*mp, config.lora.hop_limit);
if (hopsUsed > (int32_t)(config.lora.hop_limit + 2)) {
LOG_DEBUG("Skip send NodeInfo: %d hops away is too far away", hopsUsed);
} else {
LOG_INFO("Heard new node on ch. %d, send NodeInfo and ask for response", mp->channel);
nodeInfoModule->sendOurNodeInfo(mp->from, true, mp->channel);
}
} else {
LOG_INFO("Heard new node on ch. %d, send NodeInfo and ask for response", mp->channel);
nodeInfoModule->sendOurNodeInfo(mp->from, true, mp->channel);
LOG_DEBUG("Skip sending NodeInfo > 25%% ch. util");
}
} else {
LOG_DEBUG("Skip sending NodeInfo > 25%% ch. util");
}
}

Expand Down