jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xrdp: fix seg fault when fork on connect and disconnect

Browse Source
This commit is contained in:
Jay Sorg 2019-07-02 21:02:09 -07:00
parent 37ade1cb25
commit 1ef47cbf0b
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
xrdp/xrdp_listen.c
View File

@ -62,6 +62,7 @@ xrdp_listen_create(void)
xrdp_listen_create_pro_done(self);
self->trans_list = list_create();
self->process_list = list_create();
self->fork_list = list_create();
if (g_process_sem == 0)
{
@ -99,6 +100,7 @@ xrdp_listen_delete(struct xrdp_listen *self)
g_delete_wait_obj(self->pro_done_event);
list_delete(self->process_list);
list_delete(self->fork_list);
g_free(self);
}
@ -248,6 +250,10 @@ xrdp_listen_stop_all_listen(struct xrdp_listen *self)
int index;
struct trans *ltrans;
if (self->trans_list == NULL)
{
return 0;
}
for (index = 0; index < self->trans_list->count; index++)
{
ltrans = (struct trans *)
@ -748,10 +754,11 @@ xrdp_listen_fork(struct xrdp_listen *self, struct trans *server_trans)
process->server_trans = server_trans;
g_process = process;
xrdp_process_run(0);
tc_sem_dec(g_process_sem);
xrdp_process_delete(process);
/* mark this process to exit */
g_set_term(1);
return 0;
return 1;
}
/* parent */
@ -771,7 +778,8 @@ xrdp_listen_conn_in(struct trans *self, struct trans *new_self)
if (lis->startup_params->fork)
{
return xrdp_listen_fork(lis, new_self);
list_add_item(lis->fork_list, (intptr_t) new_self);
return 0;
}
process = xrdp_process_create(lis, lis->pro_done_event);
@ -890,6 +898,20 @@ xrdp_listen_main_loop(struct xrdp_listen *self)
{
break;
}
while (self->fork_list->count > 0)
{
ltrans = (struct trans *) list_get_item(self->fork_list, 0);
list_remove_item(self->fork_list, 0);
if (xrdp_listen_fork(self, ltrans) != 0)
{
cont = 0;
break;
}
}
if (cont == 0)
{
break;
}
}
/* stop listening */

3
xrdp/xrdp_types.h
View File

@ -406,7 +406,8 @@ struct xrdp_listen
{
int status;
struct list *trans_list; /* list of struct trans* */
struct list* process_list;
struct list *process_list;
struct list *fork_list;
tbus pro_done_event;
struct xrdp_startup_params* startup_params;
};