Skip to content

KeyVerificationModule: null-check getMeshNode() before dereference #10258

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
+30 −14
Open

KeyVerificationModule: null-check getMeshNode() before dereference #10258

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b863db9
KeyVerificationModule: null-check getMeshNode() before dereference
nightjoker7 Apr 23, 2026
df73d86
Merge remote-tracking branch 'origin/develop' into fix/keyverificatio…
nightjoker7 Apr 23, 2026
bfaa1cf
Address Copilot review: NUL-terminate strncpy at 4 sites
nightjoker7 Apr 23, 2026
25644cb
Merge branch 'develop' into fix/keyverification-null-checks
jp-bennett Apr 27, 2026
a4cbc08
Merge branch 'develop' into fix/keyverification-null-checks
jp-bennett Apr 27, 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
44 changes: 30 additions & 14 deletions src/modules/KeyVerificationModule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,11 @@ AdminMessageHandleResult KeyVerificationModule::handleAdminMessageForModule(cons
} else if (request->key_verification.message_type == meshtastic_KeyVerificationAdmin_MessageType_DO_VERIFY &&
request->key_verification.nonce == currentNonce) {
auto remoteNodePtr = nodeDB->getMeshNode(currentRemoteNode);
remoteNodePtr->bitfield |= NODEINFO_BITFIELD_IS_KEY_MANUALLY_VERIFIED_MASK;
if (remoteNodePtr != nullptr) {
remoteNodePtr->bitfield |= NODEINFO_BITFIELD_IS_KEY_MANUALLY_VERIFIED_MASK;
} else {
LOG_WARN("Key verification DO_VERIFY: remote node 0x%x no longer in NodeDB", currentRemoteNode);
}
resetToIdle();
} else if (request->key_verification.message_type == meshtastic_KeyVerificationAdmin_MessageType_DO_NOT_VERIFY) {
resetToIdle();
Expand Down Expand Up @@ -67,14 +71,17 @@ bool KeyVerificationModule::handleReceivedProtobuf(const meshtastic_MeshPacket &
keyVerificationModule->processSecurityNumber(number_picked);
});)

auto remoteNodePtr = nodeDB->getMeshNode(currentRemoteNode);
meshtastic_ClientNotification *cn = clientNotificationPool.allocZeroed();
cn->level = meshtastic_LogRecord_Level_WARNING;
sprintf(cn->message, "Enter Security Number for Key Verification");
cn->which_payload_variant = meshtastic_ClientNotification_key_verification_number_request_tag;
cn->payload_variant.key_verification_number_request.nonce = currentNonce;
strncpy(cn->payload_variant.key_verification_number_request.remote_longname, // should really check for nulls, etc
nodeDB->getMeshNode(currentRemoteNode)->user.long_name,
sizeof(cn->payload_variant.key_verification_number_request.remote_longname));
strncpy(cn->payload_variant.key_verification_number_request.remote_longname,
remoteNodePtr != nullptr ? remoteNodePtr->user.long_name : "",
sizeof(cn->payload_variant.key_verification_number_request.remote_longname) - 1);
cn->payload_variant.key_verification_number_request
.remote_longname[sizeof(cn->payload_variant.key_verification_number_request.remote_longname) - 1] = '\0';
service->sendClientNotification(cn);
LOG_INFO("Received hash2");
currentState = KEY_VERIFICATION_SENDER_AWAITING_NUMBER;
Expand All @@ -95,18 +102,23 @@ bool KeyVerificationModule::handleReceivedProtobuf(const meshtastic_MeshPacket &
[=](int selected) {
if (selected == 1) {
auto remoteNodePtr = nodeDB->getMeshNode(currentRemoteNode);
remoteNodePtr->bitfield |= NODEINFO_BITFIELD_IS_KEY_MANUALLY_VERIFIED_MASK;
if (remoteNodePtr != nullptr) {
remoteNodePtr->bitfield |= NODEINFO_BITFIELD_IS_KEY_MANUALLY_VERIFIED_MASK;
}
}
};
screen->showOverlayBanner(options);)
auto remoteNodePtr = nodeDB->getMeshNode(currentRemoteNode);
meshtastic_ClientNotification *cn = clientNotificationPool.allocZeroed();
cn->level = meshtastic_LogRecord_Level_WARNING;
sprintf(cn->message, "Final confirmation for incoming manual key verification %s", message);
cn->which_payload_variant = meshtastic_ClientNotification_key_verification_final_tag;
cn->payload_variant.key_verification_final.nonce = currentNonce;
strncpy(cn->payload_variant.key_verification_final.remote_longname, // should really check for nulls, etc
nodeDB->getMeshNode(currentRemoteNode)->user.long_name,
sizeof(cn->payload_variant.key_verification_final.remote_longname));
strncpy(cn->payload_variant.key_verification_final.remote_longname,
remoteNodePtr != nullptr ? remoteNodePtr->user.long_name : "",
sizeof(cn->payload_variant.key_verification_final.remote_longname) - 1);
cn->payload_variant.key_verification_final
.remote_longname[sizeof(cn->payload_variant.key_verification_final.remote_longname) - 1] = '\0';
cn->payload_variant.key_verification_final.isSender = false;
service->sendClientNotification(cn);

Expand Down Expand Up @@ -196,15 +208,18 @@ meshtastic_MeshPacket *KeyVerificationModule::allocReply()
responsePacket->pki_encrypted = true;
IF_SCREEN(snprintf(message, 25, "Security Number \n%03u %03u", currentSecurityNumber / 1000, currentSecurityNumber % 1000);
screen->showSimpleBanner(message, 30000); LOG_WARN("%s", message);)
auto remoteNodePtr = nodeDB->getMeshNode(currentRemoteNode);
meshtastic_ClientNotification *cn = clientNotificationPool.allocZeroed();
cn->level = meshtastic_LogRecord_Level_WARNING;
sprintf(cn->message, "Incoming Key Verification.\nSecurity Number\n%03u %03u", currentSecurityNumber / 1000,
currentSecurityNumber % 1000);
cn->which_payload_variant = meshtastic_ClientNotification_key_verification_number_inform_tag;
cn->payload_variant.key_verification_number_inform.nonce = currentNonce;
strncpy(cn->payload_variant.key_verification_number_inform.remote_longname, // should really check for nulls, etc
nodeDB->getMeshNode(currentRemoteNode)->user.long_name,
sizeof(cn->payload_variant.key_verification_number_inform.remote_longname));
strncpy(cn->payload_variant.key_verification_number_inform.remote_longname,
remoteNodePtr != nullptr ? remoteNodePtr->user.long_name : "",
sizeof(cn->payload_variant.key_verification_number_inform.remote_longname) - 1);
cn->payload_variant.key_verification_number_inform
.remote_longname[sizeof(cn->payload_variant.key_verification_number_inform.remote_longname) - 1] = '\0';
cn->payload_variant.key_verification_number_inform.security_number = currentSecurityNumber;
service->sendClientNotification(cn);
LOG_WARN("Security Number %04u, nonce %llu", currentSecurityNumber, currentNonce);
Expand Down Expand Up @@ -265,9 +280,10 @@ void KeyVerificationModule::processSecurityNumber(uint32_t incomingNumber)
sprintf(cn->message, "Final confirmation for outgoing manual key verification %s", message);
cn->which_payload_variant = meshtastic_ClientNotification_key_verification_final_tag;
cn->payload_variant.key_verification_final.nonce = currentNonce;
strncpy(cn->payload_variant.key_verification_final.remote_longname, // should really check for nulls, etc
nodeDB->getMeshNode(currentRemoteNode)->user.long_name,
sizeof(cn->payload_variant.key_verification_final.remote_longname));
strncpy(cn->payload_variant.key_verification_final.remote_longname, remoteNodePtr->user.long_name,
sizeof(cn->payload_variant.key_verification_final.remote_longname) - 1);
cn->payload_variant.key_verification_final
.remote_longname[sizeof(cn->payload_variant.key_verification_final.remote_longname) - 1] = '\0';
cn->payload_variant.key_verification_final.isSender = true;
service->sendClientNotification(cn);
LOG_INFO(message);
Expand Down
Loading