Skip to content

Check if ct is not null before doing is_addr_on_stack in the macos signal handler. #55603

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 5 commits into from
Sep 3, 2024
Merged

Check if ct is not null before doing is_addr_on_stack in the macos signal handler. #55603

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
974f9f2
Check if ct is not null before doing is_addr_on_stack. If that's the …
gbaraldi Aug 27, 2024
fd6bfac
Add more extensive checks in the mach signal handler
gbaraldi Aug 27, 2024
824579f
Merge branch 'master' into gb/sign
gbaraldi Aug 30, 2024
71a3f7a
Update src/signals-mach.c
gbaraldi Sep 2, 2024
5812e3d
Merge branch 'master' into gb/sign
gbaraldi Sep 3, 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/signals-mach.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,9 @@ static void segv_handler(int sig, siginfo_t *info, void *context)
return;
}
jl_task_t *ct = jl_get_current_task();
if ((sig != SIGBUS || info->si_code == BUS_ADRERR) && is_addr_on_stack(ct, info->si_addr)) { // stack overflow and not a BUS_ADRALN (alignment error)
if ((sig != SIGBUS || info->si_code == BUS_ADRERR) &&
(ct == NULL || ct->ptls == NULL || jl_atomic_load_relaxed(&ct->ptls->gc_state) == JL_GC_STATE_WAITING || ct->eh == NULL)
&& is_addr_on_stack(ct, info->si_addr)) { // stack overflow and not a BUS_ADRALN (alignment error)
stack_overflow_warning();
}
sigdie_handler(sig, info, context);
Expand Down