Skip to content

Fix stack overflow in CVE-2023-31922 #157

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
merged 2 commits into from
Dec 1, 2023
Merged

Fix stack overflow in CVE-2023-31922 #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2425b54
Fix stack overflow in CVE-2023-31922
nickva May 28, 2023
6c6de03
Update tests/test_builtin.js
bnoordhuis Dec 1, 2023
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
6 changes: 6 additions & 0 deletions quickjs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43631,6 +43631,12 @@ static int js_proxy_isArray(JSContext *ctx, JSValueConst obj)
JSProxyData *s = JS_GetOpaque(obj, JS_CLASS_PROXY);
if (!s)
return FALSE;

if (js_check_stack_overflow(ctx->rt, 0)) {
JS_ThrowStackOverflow(ctx);
return -1;
}

if (s->is_revoked) {
JS_ThrowTypeErrorRevokedProxy(ctx);
return -1;
Expand Down
20 changes: 20 additions & 0 deletions tests/test_builtin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -707,6 +707,25 @@ function test_generator()
assert(v.value === undefined && v.done === true);
}

/* CVE-2023-31922 */
function test_proxy_is_array()
{
for (var r = new Proxy([], {}), y = 0; y < 331072; y++)
r = new Proxy(r, {});

try {
/* Without ASAN */
assert(Array.isArray(r));
} catch(e) {
/* With ASAN expect InternalError "stack overflow" to be raised */
if (e instanceof InternalError) {
assert(e.message, "stack overflow", "Stack overflow error was not raised")
} else {
throw e;
}
}
}

test();
test_function();
test_enum();
Expand All @@ -724,3 +743,4 @@ test_map();
test_weak_map();
test_weak_set();
test_generator();
test_proxy_is_array();