Skip to content

[metadata_update] Fix bounds check error #49328

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
1 commit merged into from
Mar 9, 2021
Merged

[metadata_update] Fix bounds check error #49328

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions src/mono/mono/metadata/metadata-internals.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -973,6 +973,7 @@ mono_metadata_table_bounds_check (MonoImage *image, int table_index, int token_i
gboolean
mono_metadata_table_bounds_check_slow (MonoImage *image, int table_index, int token_index);

/* token_index is 1-based */
static inline gboolean
mono_metadata_table_bounds_check (MonoImage *image, int table_index, int token_index)
{
Expand Down
8 changes: 6 additions & 2 deletions src/mono/mono/metadata/metadata.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1000,8 +1000,11 @@ mono_metadata_table_bounds_check_slow (MonoImage *image, int table_index, int to
GList *list = image->delta_image;
MonoImage *dmeta;
MonoTableInfo *table;
/* result row, 0-based */
int ridx;

int original_token = mono_metadata_make_token (table_index, token_index);

uint32_t exposed_gen = mono_metadata_update_get_thread_generation ();
do {
if (!list)
Expand All @@ -1011,7 +1014,8 @@ mono_metadata_table_bounds_check_slow (MonoImage *image, int table_index, int to
return TRUE;
list = list->next;
table = &dmeta->tables [table_index];
ridx = mono_image_relative_delta_index (dmeta, mono_metadata_make_token (table_index, token_index + 1)) - 1;
/* mono_image_relative_delta_index returns a 1-based index */
ridx = mono_image_relative_delta_index (dmeta, original_token) - 1;
} while (ridx < 0 || ridx >= table->rows);

return FALSE;
Expand Down Expand Up @@ -4779,7 +4783,7 @@ mono_metadata_parse_mh_full (MonoImage *m, MonoGenericContainer *container, cons

if (local_var_sig_tok) {
int idx = mono_metadata_token_index (local_var_sig_tok) - 1;
if (mono_metadata_table_bounds_check (m, MONO_TABLE_STANDALONESIG, idx)) {
if (mono_metadata_table_bounds_check (m, MONO_TABLE_STANDALONESIG, idx + 1)) {
mono_error_set_bad_image (error, m, "Invalid method header local vars signature token 0x%08x", idx);
goto fail;
}
Expand Down