clearlinux/graphene
2
0
Fork 0
mirror of https://github.com/clearlinux/graphene.git synced 2026-09-06 05:41:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

[LibOS] Fix nested function callbacks segfaulting

Browse Source
This commit is contained in:
borysp
2019-09-04 03:10:33 +02:00
committed by Michał Kowalczyk
parent 34384c6bb2
commit 52b3525bab
1 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LibOS/shim/src/ipc/shim_ipc_pid.c
+26 -26
View File
@@ -177,6 +177,32 @@ int ipc_pid_getstatus_send (struct shim_ipc_port * port, IDTYPE dest,
return ret;
}
struct thread_status {
int npids;
IDTYPE * pids;
int nstatus;
struct pid_status * status;
};
int check_thread (struct shim_thread * thread, void * arg,
bool * unlocked)
{
__UNUSED(unlocked); // Kept for API compatibility
struct thread_status * status = (struct thread_status *) arg;
for (int i = 0 ; i < status->npids ; i++)
if (status->pids[i] == thread->tid &&
thread->in_vm && thread->is_alive) {
status->status[status->nstatus].pid = thread->tid;
status->status[status->nstatus].tgid = thread->tgid;
status->status[status->nstatus].pgid = thread->pgid;
status->nstatus++;
return 1;
}
return 0;
}
int ipc_pid_getstatus_callback (IPC_CALLBACK_ARGS)
{
BEGIN_PROFILE_INTERVAL();
@@ -187,32 +213,6 @@ int ipc_pid_getstatus_callback (IPC_CALLBACK_ARGS)
debug("ipc callback from %u: IPC_PID_GETSTATUS(%d, [%u, ...])\n",
msg->src, msgin->npids, msgin->pids[0]);
struct thread_status {
int npids;
IDTYPE * pids;
int nstatus;
struct pid_status * status;
};
int check_thread (struct shim_thread * thread, void * arg,
bool * unlocked)
{
__UNUSED(unlocked); // Kept for API compatibility
struct thread_status * status = (struct thread_status *) arg;
for (int i = 0 ; i < status->npids ; i++)
if (status->pids[i] == thread->tid &&
thread->in_vm && thread->is_alive) {
status->status[status->nstatus].pid = thread->tid;
status->status[status->nstatus].tgid = thread->tgid;
status->status[status->nstatus].pgid = thread->pgid;
status->nstatus++;
return 1;
}
return 0;
}
struct thread_status status;
status.npids = msgin->npids;
status.pids = msgin->pids;