ElixirForge/firmware
1
0
Fork 0
mirror of https://github.com/alexhopeoconnor/firmware.git synced 2026-10-04 03:18:10 +10:00
Code Releases Activity

fix(Radio): reject bogus coding rate and length readbacks on RX (#11408)

Browse Source
This commit is contained in:
Thomas Göttgens
2026-08-11 18:28:04 +02:00
committed by GitHub
parent 546b9d9e40
commit 5d04f86af3
2 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesh/RadioLibInterface.cpp
+7
View File
@@ -616,6 +616,13 @@ void RadioLibInterface::handleReceiveInterrupt()
// read the number of actually received bytes
size_t length = iface->getPacketLength();
// Some drivers report this as a 16 bit value, so a bad readback can overrun radioBuffer in readData()
if (length > sizeof(radioBuffer)) {
LOG_ERROR("Ignore rx packet, bad length %u", (unsigned int)length);
rxBad++;
return;
}
uint32_t rxMsec = getPacketTime(length, true);
#ifndef DISABLE_WELCOME_UNSET
src/mesh/RadioLibInterface.h
+20 -14
View File
@@ -331,23 +331,29 @@ class RadioLibInterface : public RadioInterface, protected concurrency::Notified
template <typename T> uint32_t computePacketTime(T &lora, uint32_t pl, bool received)
{
if (received) {
// First get the actual coding rate and CRC status from the received packet
uint8_t rxCR;
bool hasCRC;
lora.getLoRaRxHeaderInfo(&rxCR, &hasCRC);
// Go from raw header value to denominator
if (rxCR < 5) {
rxCR += 4;
} else if (rxCR == 7) {
rxCR = 8;
}
// Received packet configuration must be the same as configured, except for coding rate and CRC
DataRate_t dr = getDataRate();
dr.lora.codingRate = rxCR;
PacketConfig_t pc = getPacketConfig();
pc.lora.crcEnabled = hasCRC;
uint8_t rxCR = 0;
bool hasCRC = true;
if (lora.getLoRaRxHeaderInfo(&rxCR, &hasCRC) == RADIOLIB_ERR_NONE) {
// Raw 0 is reserved and >7 is either undefined or an LR2021-only convolutional rate no
// Meshtastic peer can send. calculateTimeOnAir() would multiply by it unchecked.
if (rxCR < 1 || rxCR > 7) {
LOG_WARN("Bogus RX coding rate %d from radio, use configured %d", rxCR, dr.lora.codingRate);
} else {
// Go from raw header value to denominator
if (rxCR < 5) {
rxCR += 4;
} else if (rxCR == 7) {
rxCR = 8;
}
dr.lora.codingRate = rxCR;
pc.lora.crcEnabled = hasCRC;
}
}
return lora.calculateTimeOnAir(modemType, dr, pc, pl) / 1000;
}