Skip to content

SN_Decode_GWInfo: reject extended-length frame too short for gwId #542

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
dxbjavid wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −1
Open

SN_Decode_GWInfo: reject extended-length frame too short for gwId #542

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion src/mqtt_sn_packet.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,15 @@ int SN_Decode_GWInfo(byte *rx_buf, int rx_buf_len, SN_GwInfo *gw_info)
if (total_len > rx_buf_len) {
return MQTT_TRACE_ERROR(MQTT_CODE_ERROR_OUT_OF_BUFFER);
}
if (total_len < 3) {
/* Reject a frame whose total_len cannot cover the bytes still to be read
* after the length-indicator block (message type + gateway ID). The
* short-form header consumes one byte and the extended-length form
* consumes three, so the prior fixed "< 3" minimum was only valid for
* the short form: an extended-length GWINFO with total_len <= the
* header bytes already consumed would slip past it and the
* *rx_payload++ reads below would walk past the caller-supplied
* buffer. */
if (total_len < (word16)(rx_payload - rx_buf) + 2) {
return MQTT_TRACE_ERROR(MQTT_CODE_ERROR_MALFORMED_DATA);
}
/* Check message type */
Expand Down
Loading