mirror of
https://github.com/tangerineturtle1/NX2navi.git
synced 2026-11-16 18:09:58 -04:00
Hold a reference on an IPC session for the length of a request, and copy the transfer memory under the kernel lock.
SendSyncRequest looked the session up with kern_handle_get, which holds the kernel lock only for the lookup, and then dispatched to the handler with no reference. A CloseHandle of the session's last handle on another thread meanwhile reached ipc_handle_closed, which ran the close callback and freed the session while the handler still used it; for the audio renderer, renderer_close joins the render thread and frees the renderer a RequestUpdate is reading. OpenAudioRenderer read the transfer memory the same way, and a CloseHandle frees that object at once. kernel.c gains kern_handle_hold, which runs a hold callback under the kernel lock after the lookup (handle_close clears the slot under that lock before it calls ipc_handle_closed, so a close either comes first and the lookup fails, or comes after and finds the extra reference), and kern_handle_copy, which copies an object under the lock. ipc_svc takes the session with kern_handle_hold and drops the request's reference through ipc_handle_closed after the answer, so the close callback runs on whichever thread drops the last reference; the request thread holds no service lock by then. audren.c copies the transfer memory into a local IpcTransferMemory. Domain sub-objects are not freed yet (IpcSession.objects), so their lookups are left for the domain object change. Not reproduced before the change in a game run (no log shows a renderer closed during play). tests/ipc_session_check.py builds ipc.c with kernel.c linked: a request whose handler blocks while another thread closes the session's only handle must leave the close callback until the handler returns, and a closed transfer memory handle must copy nothing. Against the previous ipc.c it fails with the close callback run while the handler was blocked. system_event_check, sync_wake_check and the compile check of every runtime file pass. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -2090,6 +2090,26 @@ void *kern_handle_get(uint32_t h, int kind) {
|
||||
return o;
|
||||
}
|
||||
|
||||
// kern_handle_get that also runs hold(obj) holding G, so the caller can take a reference before a CloseHandle on
|
||||
// another thread drops the handle's own: handle_close clears the slot holding G and only then calls ipc_handle_closed.
|
||||
void *kern_handle_hold(uint32_t h, int kind, void (*hold)(void *obj)) {
|
||||
lock();
|
||||
void *o = h_peek(h, kind);
|
||||
if (o) hold(o);
|
||||
unlock();
|
||||
return o;
|
||||
}
|
||||
|
||||
// Copies n bytes of a handle's object holding G, for objects without a reference count (KERN_TMEM, freed by its
|
||||
// CloseHandle): 1 when h is a handle of that kind, else 0 and nothing copied.
|
||||
int kern_handle_copy(uint32_t h, int kind, void *out, size_t n) {
|
||||
lock();
|
||||
const void *o = h_peek(h, kind);
|
||||
if (o) memcpy(out, o, n);
|
||||
unlock();
|
||||
return o != NULL;
|
||||
}
|
||||
|
||||
uint32_t kern_event_new(void) {
|
||||
Event *e = calloc(1, sizeof *e);
|
||||
if (!e) rt_fatal("kernel: event allocation");
|
||||
|
||||
Reference in New Issue
Block a user