Skip to content

[mono] Fix race during mono_image_storage_open #55201

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
marek-safar merged 1 commit into from
Jul 14, 2021
Merged

[mono] Fix race during mono_image_storage_open #55201

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
[mono] Fix race during mono_image_storage_open 
* The mono_refcount_inc call in mono_image_storage_trypublish or
  mono_image_storage_tryaddref may abort when racing against a
  mono_image_storage_dtor that already decremented the refcount.
  • Loading branch information
@uweigand
uweigand committed Jul 6, 2021
commit a429cbf8545ea4163523abed13bd2776263b1873
10 changes: 8 additions & 2 deletions src/mono/mono/metadata/image.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1263,8 +1263,11 @@ mono_image_storage_trypublish (MonoImageStorage *candidate, MonoImageStorage **o
gboolean result;
mono_images_storage_lock ();
MonoImageStorage *val = (MonoImageStorage *)g_hash_table_lookup (images_storage_hash, candidate->key);
if (val && !mono_refcount_tryinc (val)) {
// We raced against a mono_image_storage_dtor in progress.
val = NULL;
}
if (val) {
mono_refcount_inc (val);
*out_storage = val;
result = FALSE;
} else {
Expand Down Expand Up @@ -1295,8 +1298,11 @@ mono_image_storage_tryaddref (const char *key, MonoImageStorage **found)
gboolean result = FALSE;
mono_images_storage_lock ();
MonoImageStorage *val = (MonoImageStorage *)g_hash_table_lookup (images_storage_hash, key);
if (val && !mono_refcount_tryinc (val)) {
// We raced against a mono_image_storage_dtor in progress.
val = NULL;
}
if (val) {
mono_refcount_inc (val);
*found = val;
result = TRUE;
}
Expand Down