Merge pull request #3807 from Valentin-Metz/fix/cli-reply-buffer-overflow

Fix stack-buffer overflow in CLI reply buffers
This commit is contained in:
Liam Cottle authored and GitHub committed 2026-11-11 17:37:42 +13:00
commit 09eac55bc3
4 files changed
+8 -4

No files matched your search

+2 -1
View File
@@ -779,7 +779,8 @@ void MyMesh::onPeerDataRecv(mesh::Packet *packet, uint8_t type, int sender_idx,
}
}
uint8_t temp[166];
// 5-byte datagram header + 3-byte reflected CLI prefix + 160-byte reply text + NUL
uint8_t temp[169];
char *command = (char *)&data[5];
char *reply = (char *)&temp[5];
if (is_retry) {
+2 -1
View File
@@ -462,7 +462,8 @@ void MyMesh::onPeerDataRecv(mesh::Packet *packet, uint8_t type, int sender_idx,
mesh::Utils::sha256((uint8_t *)&ack_hash, 4, data, 5 + strlen((char *)&data[5]), client->id.pub_key,
PUB_KEY_SIZE);
uint8_t temp[166];
// 5-byte datagram header + 3-byte reflected CLI prefix + 160-byte reply text + NUL
uint8_t temp[169];
bool send_ack;
if (flags == TXT_TYPE_CLI_DATA || flags == TXT_TYPE_CLI_COMMAND) {
if (client->isAdmin()) {
+2 -1
View File
@@ -667,7 +667,8 @@ void SensorMesh::onPeerDataRecv(mesh::Packet* packet, uint8_t type, int sender_i
// len can be > original length, but 'text' will be padded with zeroes
data[len] = 0; // need to make a C string again, with null terminator
uint8_t temp[166];
// 5-byte datagram header + 3-byte reflected CLI prefix + 160-byte reply text + NUL
uint8_t temp[169];
char *command = (char *) &data[5];
char *reply = (char *) &temp[5];
handleCommand(from, sender_timestamp, command, reply);
+2 -1
View File
@@ -266,7 +266,8 @@ void BaseChatMesh::onPeerDataRecv(mesh::Packet* packet, uint8_t type, int sender
onCommandDataRecv(from, packet, sender_timestamp, text); // let UI know
// NOTE: no ack expected for CLI_DATA replies
} else if (flags == TXT_TYPE_CLI_COMMAND) {
uint8_t temp[166];
// 5-byte datagram header + 3-byte reflected CLI prefix + 160-byte reply text + NUL
uint8_t temp[169];
char *command = (char *)&data[5];
char *reply = (char *)&temp[5];
*reply = 0;