Skip to content
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

Jump to bottom

helper: fix out of bound access on unmarshal #17

Merged
merged 2 commits into from
Aug 7, 2023
Merged

helper: fix out of bound access on unmarshal #17

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
e89320c
helper: fix out of bound access on unmarshal
onkwon Aug 7, 2023
fe99ad5
fix test case
onkwon Aug 7, 2023
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
1 change: 1 addition & 0 deletions include/cbor/helper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ extern "C" {

struct cbor_parser {
const void *key;
size_t keylen;
void (*run)(const cbor_reader_t *reader,
const struct cbor_parser *parser,
const cbor_item_t *item, void *arg);
Expand Down
2 changes: 1 addition & 1 deletion src/helper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ static const struct cbor_parser *get_parser(const struct parser_ctx *ctx,
continue;
}

if (strkey && strkey_len) {
if (strkey && strkey_len && p->keylen >= strkey_len) {
if (memcmp(p->key, strkey, strkey_len) == 0) {
return p;
}
Expand Down
36 changes: 34 additions & 2 deletions tests/src/helper_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,25 @@ static void parse_key(const cbor_reader_t *reader,
mock().actualCall(__func__);
}

static void parse_strkey(const cbor_reader_t *reader,
const struct cbor_parser *parser,
const cbor_item_t *item, void *arg) {
mock().actualCall(__func__);
}

static void parse_intkey(const cbor_reader_t *reader,
const struct cbor_parser *parser,
const cbor_item_t *item, void *arg) {
mock().actualCall(__func__);
}

static const struct cbor_parser parsers[] = {
{ .key = "certificate", .run = parse_cert },
{ .key = "privateKey", .run = parse_key },
{ .key = "certificate", .keylen = 11, .run = parse_cert },
{ .key = "privateKey", .keylen = 10, .run = parse_key},
{ .key = "strkey1", .keylen = 7, .run = parse_strkey },
{ .key = (const void *)1, .run = parse_intkey },
{ .key = "strkey2", .keylen = 7, .run = parse_strkey },
{ .key = (const void *)2, .run = parse_intkey },
};

TEST_GROUP(Helper) {
Expand Down Expand Up @@ -74,3 +90,19 @@ TEST(Helper, unmarshal_ShouldReturnFalse_WhenInvalidMessageGiven) {
sizeof(parsers) / sizeof(*parsers),
msg, sizeof(msg), 0));
}

TEST(Helper, ShouldUnmarshal_WhenBothOfStrKeyAndIntKeyGiven) {
uint8_t msg[] = {
0xA4, 0x01, 0x66, 0x69, 0x6E, 0x74, 0x6B, 0x65,
0x79, 0x67, 0x73, 0x74, 0x72, 0x6B, 0x65, 0x79,
0x32, 0x63, 0x61, 0x62, 0x63, 0x02, 0x01, 0x67,
0x73, 0x74, 0x72, 0x6B, 0x65, 0x79, 0x31, 0x02,
};

mock().expectNCalls(2, "parse_intkey");
mock().expectNCalls(2, "parse_strkey");

LONGS_EQUAL(true, cbor_unmarshal(&reader, parsers,
sizeof(parsers) / sizeof(*parsers),
msg, sizeof(msg), 0));
}
Loading