Skip to content

MDEV-40924: validate insert_length before memcpy in KEY_OP_ADD_SUFFIX #5598

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
shoemoney wants to merge 1 commit into
base: 10.11
Choose a base branch
from
+12 −0
Open

MDEV-40924: validate insert_length before memcpy in KEY_OP_ADD_SUFFIX #5598

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
12 changes: 12 additions & 0 deletions storage/maria/ma_key_recover.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1059,6 +1059,12 @@ uint _ma_apply_redo_index(MARIA_HA *info,
{
uint insert_length= uint2korr(header);
DBUG_PRINT("redo", ("key_op_add_suffix: %u", insert_length));
if (header + 2 + insert_length > header_end ||
page_length + insert_length > max_page_size)
{
result= mark_crashed= 1;
goto err;
}
DBUG_ASSERT(page_length + insert_length <= max_page_size);
memcpy(buff + page_length, header+2, insert_length);

Expand All @@ -1071,6 +1077,12 @@ uint _ma_apply_redo_index(MARIA_HA *info,
uint del_length= uint2korr(header);
header+= 2;
DBUG_PRINT("redo", ("key_op_del_suffix: %u", del_length));
if (header > header_end ||
page_length < keypage_header + del_length)
{
result= mark_crashed= 1;
goto err;
}
DBUG_ASSERT(page_length - del_length >= keypage_header);
page_length-= del_length;
break;
Expand Down