Skip to content

fix(libkernel): block guest signals by FreeBSD's bit n - 1 #2

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
SleglJan merged 1 commit into from
Oct 10, 2026
Merged

fix(libkernel): block guest signals by FreeBSD's bit n - 1 #2

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion core/libs/prx/libkernel/System/src/Signals.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ void Dispatch(int native) {
// Preserve the guest's persistent registration across CRT delivery.
std::signal(native, Dispatch);
#endif
if ((blockedMask.load() & (1u << guest)) != 0) return;
if ((blockedMask.load() & (1u << (guest - 1))) != 0) return;
const auto callback = handlers[guest].load();
if (reinterpret_cast<std::uintptr_t>(callback) > 1) callback(guest);
}
Expand Down
12 changes: 12 additions & 0 deletions core/libs/tests/GuestSignals.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,4 +105,16 @@ int main() {
Require(sigaction_nid_postfix(fixed, &defaults, &current) == 0 && current.handler == 0);
}
Require(sigaction_nid_postfix(15, nullptr, nullptr) == 0);
Require(signal_nid_postfix(15, Callback) != invalid);
GuestSignalSet termMask{{1u << 14, 0, 0, 0}};
received = 0;
Require(sigprocmask_nid_postfix(1, &termMask, nullptr) == 0);
Require(raise_nid_postfix(15) == 0 && received == 0);
Require(sigprocmask_nid_postfix(2, &termMask, nullptr) == 0);
Require(raise_nid_postfix(15) == 0 && received == 15);
GuestSignalSet urgMask{{1u << 15, 0, 0, 0}};
received = 0;
Require(sigprocmask_nid_postfix(1, &urgMask, nullptr) == 0);
Require(raise_nid_postfix(15) == 0 && received == 15);
Require(sigprocmask_nid_postfix(2, &urgMask, nullptr) == 0);
}
Loading