gnh1201/wasm-micro-runtime
1
0
Fork 0
mirror of https://github.com/bytecodealliance/wasm-micro-runtime.git synced 2025-05-16 06:31:14 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fix bh_vector extend_vector not locked issue (#1187)

Browse Source 
Fix issue that func `extend_vector` isn't locked in vector insert and append.
This commit is contained in:
liang.he 2022-05-24 09:10:43 +08:00 committed by GitHub
parent 723a808106
commit 565c1c04db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
core/shared/utils/bh_vector.c
View File

@ -23,6 +23,10 @@ alloc_vector_data(size_t length, size_t size_elem)
return data; return data;
} }
/**
* every caller of `extend_vector` must provide
* a thread-safe environment.
*/
static bool static bool
extend_vector(Vector *vector, size_t length) extend_vector(Vector *vector, size_t length)
{ {
@ -38,15 +42,11 @@ extend_vector(Vector *vector, size_t length)
return false; return false;
} }
if (vector->lock)
os_mutex_lock(vector->lock);
memcpy(data, vector->data, vector->size_elem * vector->max_elems); memcpy(data, vector->data, vector->size_elem * vector->max_elems);
BH_FREE(vector->data); BH_FREE(vector->data);
vector->data = data; vector->data = data;
vector->max_elems = length; vector->max_elems = length;
if (vector->lock)
os_mutex_unlock(vector->lock);
return true; return true;
} }
@ -143,24 +143,26 @@ bh_vector_insert(Vector *vector, uint32 index, const void *elem_buf)
{ {
size_t i; size_t i;
uint8 *p; uint8 *p;
bool ret = false;
if (!vector || !elem_buf) { if (!vector || !elem_buf) {
LOG_ERROR("Insert vector elem failed: vector or elem buf is NULL.\n"); LOG_ERROR("Insert vector elem failed: vector or elem buf is NULL.\n");
return false; goto just_return;
} }
if (index >= vector->num_elems) { if (index >= vector->num_elems) {
LOG_ERROR("Insert vector elem failed: invalid elem index.\n"); LOG_ERROR("Insert vector elem failed: invalid elem index.\n");
return false; goto just_return;
}
if (!extend_vector(vector, vector->num_elems + 1)) {
LOG_ERROR("Insert vector elem failed: extend vector failed.\n");
return false;
} }
if (vector->lock) if (vector->lock)
os_mutex_lock(vector->lock); os_mutex_lock(vector->lock);
if (!extend_vector(vector, vector->num_elems + 1)) {
LOG_ERROR("Insert vector elem failed: extend vector failed.\n");
goto unlock_return;
}
p = vector->data + vector->size_elem * vector->num_elems; p = vector->data + vector->size_elem * vector->num_elems;
for (i = vector->num_elems - 1; i > index; i--) { for (i = vector->num_elems - 1; i > index; i--) {
memcpy(p, p - vector->size_elem, vector->size_elem); memcpy(p, p - vector->size_elem, vector->size_elem);
@ -169,32 +171,44 @@ bh_vector_insert(Vector *vector, uint32 index, const void *elem_buf)
memcpy(p, elem_buf, vector->size_elem); memcpy(p, elem_buf, vector->size_elem);
vector->num_elems++; vector->num_elems++;
ret = true;
unlock_return:
if (vector->lock) if (vector->lock)
os_mutex_unlock(vector->lock); os_mutex_unlock(vector->lock);
return true; just_return:
return ret;
} }
bool bool
bh_vector_append(Vector *vector, const void *elem_buf) bh_vector_append(Vector *vector, const void *elem_buf)
{ {
bool ret = false;
if (!vector || !elem_buf) { if (!vector || !elem_buf) {
LOG_ERROR("Append vector elem failed: vector or elem buf is NULL.\n"); LOG_ERROR("Append vector elem failed: vector or elem buf is NULL.\n");
return false; goto just_return;
} }
/* make sure one more slot is used by the thread who allocas it */
if (vector->lock)
os_mutex_lock(vector->lock);
if (!extend_vector(vector, vector->num_elems + 1)) { if (!extend_vector(vector, vector->num_elems + 1)) {
LOG_ERROR("Append ector elem failed: extend vector failed.\n"); LOG_ERROR("Append ector elem failed: extend vector failed.\n");
return false; goto unlock_return;
} }
if (vector->lock)
os_mutex_lock(vector->lock);
memcpy(vector->data + vector->size_elem * vector->num_elems, elem_buf, memcpy(vector->data + vector->size_elem * vector->num_elems, elem_buf,
vector->size_elem); vector->size_elem);
vector->num_elems++; vector->num_elems++;
ret = true;
unlock_return:
if (vector->lock) if (vector->lock)
os_mutex_unlock(vector->lock); os_mutex_unlock(vector->lock);
return true; just_return:
return ret;
} }
bool bool