Skip to content
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

Add boundscheck in bindingkey_eq to avoid OOB access due to data race #54671

Merged
merged 2 commits into from
Jun 5, 2024
Merged

Add boundscheck in bindingkey_eq to avoid OOB access due to data race #54671

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e7bb5e
Add boundscheck in bindingkey_eq to avoid OOB access due to data race
gbaraldi Jun 4, 2024
776ff41
Update src/module.c
gbaraldi Jun 4, 2024
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
4 changes: 3 additions & 1 deletion src/module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -710,13 +710,15 @@ JL_DLLEXPORT int jl_binding_resolved_p(jl_module_t *m, jl_sym_t *var)

static uint_t bindingkey_hash(size_t idx, jl_value_t *data)
{
jl_binding_t *b = (jl_binding_t*)jl_svecref(data, idx);
jl_binding_t *b = (jl_binding_t*)jl_svecref(data, idx); // This must always happen inside the lock
jl_sym_t *var = b->globalref->name;
return var->hash;
}

static int bindingkey_eq(size_t idx, const void *var, jl_value_t *data, uint_t hv)
{
if ((idx >= ((jl_svec_t*)data)->length || idx < 0))
return 0; // We got a OOB access, probably due to a data race
gbaraldi marked this conversation as resolved.
Show resolved Hide resolved
jl_binding_t *b = (jl_binding_t*)jl_svecref(data, idx);
jl_sym_t *name = b->globalref->name;
return var == name;
Expand Down