Skip to content

[Backport v1.14] net: coap: Fix possible overflow #24530

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

Merged
merged 1 commit into from
Jun 4, 2020
Merged

[Backport v1.14] net: coap: Fix possible overflow #24530

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
19 changes: 14 additions & 5 deletions subsys/net/lib/coap/coap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,9 @@ static int parse_option(u8_t *data, u16_t offset, u16_t *pos,
return -EINVAL;
}

*opt_len += hdr_len;
if (__builtin_add_overflow(*opt_len, hdr_len, opt_len)) {
return -EINVAL;
}
}

if (len > COAP_OPTION_NO_EXT) {
Expand All @@ -475,11 +477,15 @@ static int parse_option(u8_t *data, u16_t offset, u16_t *pos,
return -EINVAL;
}

*opt_len += hdr_len;
if (__builtin_add_overflow(*opt_len, hdr_len, opt_len)) {
return -EINVAL;
}
}

*opt_delta += delta;
*opt_len += len;
if (__builtin_add_overflow(*opt_delta, delta, opt_delta) ||
__builtin_add_overflow(*opt_len, len, opt_len)) {
return -EINVAL;
}

if (r == 0) {
if (len == 0U) {
Expand Down Expand Up @@ -514,7 +520,10 @@ static int parse_option(u8_t *data, u16_t offset, u16_t *pos,
return -EINVAL;
}
} else {
*pos += len;
if (__builtin_add_overflow(*pos, len, pos)) {
return -EINVAL;
}

r = max_len - *pos;
}

Expand Down