Skip to content

NO-JIRA: Fix 32-bit length overflow in AMQP consumer bounds checks #453

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
kakkar87d wants to merge 2 commits into
base: main
Choose a base branch
from
Open

NO-JIRA: Fix 32-bit length overflow in AMQP consumer bounds checks #453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
761cafe
NO-JIRA: Fix 32-bit length overflow in AMQP consumer bounds checks
kakkar87d Oct 22, 2026
8c2eec2
NO-JIRA: add regression test for oversized str32 length in open frame
kakkar87d Oct 23, 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 c/src/core/consumers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ static inline bool pni_consumer_readv8(pni_consumer_t *consumer, pn_bytes_t* byt
static inline bool pni_consumer_readv32(pni_consumer_t *consumer, pn_bytes_t* bytes){
uint32_t size;
if (!pni_consumer_readf32(consumer, &size)) return false;
if (consumer->position+size > consumer->size) {
if (size > consumer->size - consumer->position) {
consumer->position = consumer->size;
return false;
}
Expand Down Expand Up @@ -194,7 +194,7 @@ static inline bool pni_consumer_read_value_not_described(pni_consumer_t* consume
case 0xF: {
uint32_t size;
if (!pni_consumer_readf32(consumer, &size)) return false;
if (consumer->position+size > consumer->size) break;
if (size > consumer->size - consumer->position) break;
*value = (pn_bytes_t){.size=size,.start=(const char *)consumer->output_start+consumer->position};
consumer->position += size;
return true;
Expand Down
27 changes: 27 additions & 0 deletions c/tests/connection_driver_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,3 +618,30 @@ TEST_CASE("driver_empty_last_frame") {
cond_empty());
CHECK_THAT(*pn_connection_condition(d.server.connection), cond_empty());
}

/* A str32 length near UINT32_MAX must not pass the consumer bounds check.
position+size wrapped on a 32-bit size_t and the oversized string was accepted.
*/
TEST_CASE("driver_open_oversized_str32") {
pn_connection_driver_t d;
pn_connection_driver_init(&d, NULL, NULL);
pn_transport_set_server(d.transport);

const char frame[] =
"AMQP\x00\x01\x00\x00"
"\x00\x00\x00\x17\x02\x00\x00\x00" /* frame header: size 23, doff 2, AMQP, channel 0 */
"\x00\x53\x10" /* open performative */
"\xc0\x0a\x01" /* list8, size 10, count 1 */
"\xb1\xff\xff\xff\xff" /* container-id: str32 claiming 0xFFFFFFFF bytes */
"AAAA";
size_t len = sizeof(frame) - 1;
pn_rwbytes_t buf = pn_connection_driver_read_buffer(&d);
REQUIRE(buf.size >= len);
memcpy(buf.start, frame, len);
pn_connection_driver_read_done(&d, len);
while (pn_connection_driver_next_event(&d))
;

CHECK(pn_connection_remote_container(d.connection) == NULL);
pn_connection_driver_destroy(&d);
}