Mirrors_Framework/grblHAL
1
0
Fork 0
mirror of https://github.com/grblHAL/core.git synced 2026-08-17 08:31:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #985 from gcormier/fix-modbus-adu-bounds

Browse Source 
Validate Modbus frame size before writing the ADU buffer
This commit is contained in:
Terje Io
2026-07-18 20:34:52 +02:00
committed by GitHub
parent b9f96d66ea ee71df957a
commit dd2131e4ae
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modbus.c
+5
View File
@@ -278,6 +278,9 @@ FLASHMEM status_code_t modbus_message (uint8_t server, modbus_function_t functio
cmd.rx_length = 5;
} else {
if(registers > MODBUS_MAX_REGISTERS) // reject requests too large for adu[]
return Status_InvalidStatement;
cmd.tx_length = 6 + 2 * registers;
cmd.rx_length = cmd.tx_length - 1;
@@ -290,6 +293,8 @@ FLASHMEM status_code_t modbus_message (uint8_t server, modbus_function_t functio
}
} else {
cmd.tx_length += 3; cmd.rx_length = 8;
if(cmd.tx_length > MODBUS_MAX_ADU_SIZE || cmd.rx_length > MODBUS_MAX_ADU_SIZE)
return Status_InvalidStatement; // frame will not fit adu[]
cmd.adu[4] = (uint8_t)(registers >> 8);
cmd.adu[5] = (uint8_t)(registers & 0xFF);
cmd.adu[6] = (uint8_t)(registers << 1);