Skip to content

Fix hard faults when handling large MSP responses over CRSF #11369

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
KeithCoreDumped wants to merge 3 commits into
base: maintenance-9.x
Choose a base branch
from
+8 −7
Open

Fix hard faults when handling large MSP responses over CRSF #11369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
497cb3a
fix: flght controller hard fault caused by insufficient CRSF rx buffe…
KeithCoreDumped Jan 20, 2026
4c4430e
fix data length overflow
KeithCoreDumped Feb 4, 2026
9225369
fix: resolve MSP connection hangs due to packet truncation and buffer…
KeithCoreDumped Feb 4, 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
4 changes: 2 additions & 2 deletions src/main/telemetry/crsf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
#include "common/time.h"
#include "rx/crsf.h"

#define CRSF_MSP_RX_BUF_SIZE 128
#define CRSF_MSP_TX_BUF_SIZE 128
#define CRSF_MSP_RX_BUF_SIZE 512
#define CRSF_MSP_TX_BUF_SIZE 512

void initCrsfTelemetry(void);
bool checkCrsfTelemetryState(void);
Expand Down
11 changes: 6 additions & 5 deletions src/main/telemetry/msp_shared.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,19 +68,20 @@ void initSharedMsp(void)
mspPackage.requestBuffer = (uint8_t *)&mspRxBuffer;
mspPackage.requestPacket = &mspRxPacket;
mspPackage.requestPacket->buf.ptr = mspPackage.requestBuffer;
mspPackage.requestPacket->buf.end = mspPackage.requestBuffer;
mspPackage.requestPacket->buf.end = mspPackage.requestBuffer + sizeof(mspRxBuffer);

mspPackage.responseBuffer = (uint8_t *)&mspTxBuffer;
mspPackage.responsePacket = &mspTxPacket;
mspPackage.responsePacket->buf.ptr = mspPackage.responseBuffer;
mspPackage.responsePacket->buf.end = mspPackage.responseBuffer;
mspPackage.responsePacket->buf.end = mspPackage.responseBuffer + sizeof(mspTxBuffer);
}

static void processMspPacket(void)
{
mspPackage.responsePacket->cmd = 0;
mspPackage.responsePacket->result = 0;
mspPackage.responsePacket->buf.end = mspPackage.responseBuffer;
mspPackage.responsePacket->buf.ptr = mspPackage.responseBuffer;
mspPackage.responsePacket->buf.end = mspPackage.responseBuffer + sizeof(mspTxBuffer);

mspPostProcessFnPtr mspPostProcessFn = NULL;
if (mspFcProcessCommand(mspPackage.requestPacket, mspPackage.responsePacket, &mspPostProcessFn) == MSP_RESULT_ERROR) {
Expand Down Expand Up @@ -217,7 +218,7 @@ bool sendMspReply(uint8_t payloadSize, mspResponseFnPtr responseFn)
}
sbufWriteU8(payloadBuf, status);

const uint8_t size = sbufBytesRemaining(txBuf);
const uint16_t size = sbufBytesRemaining(txBuf);
if (lastRequestVersion == 1) { // MSPv1
sbufWriteU8(payloadBuf, size);
sbufWriteU8(payloadBuf, mspPackage.responsePacket->cmd);
Expand All @@ -231,7 +232,7 @@ bool sendMspReply(uint8_t payloadSize, mspResponseFnPtr responseFn)
sbufWriteU8(payloadBuf, (seq++ & TELEMETRY_MSP_SEQ_MASK) | (lastRequestVersion << TELEMETRY_MSP_VER_SHIFT)); // header without 'start' flag
}

const uint8_t bufferBytesRemaining = sbufBytesRemaining(txBuf);
const uint16_t bufferBytesRemaining = sbufBytesRemaining(txBuf);
const uint8_t payloadBytesRemaining = sbufBytesRemaining(payloadBuf);
uint8_t frame[payloadBytesRemaining];

Expand Down