diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2018-06-15 15:24:48 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2018-06-15 15:24:48 +0100 |
| commit | cff17e1ac557a878514e8f332afb2e7fdf4be849 (patch) | |
| tree | f2638a2f87da7d41ad92f2785a8fcb6d4eb9ced8 /src/libserver/rspamd_control.c | |
| parent | 7718fb14602c410dc16a316bb4e9cc87850c0ee4 (diff) | |
| download | rspamd-cff17e1ac557a878514e8f332afb2e7fdf4be849.tar.gz rspamd-cff17e1ac557a878514e8f332afb2e7fdf4be849.zip | |
[Fix] Fix race-condition leak on processes reload
Diffstat (limited to 'src/libserver/rspamd_control.c')
| -rw-r--r-- | src/libserver/rspamd_control.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libserver/rspamd_control.c b/src/libserver/rspamd_control.c index bbfcdafdf..84c53700e 100644 --- a/src/libserver/rspamd_control.c +++ b/src/libserver/rspamd_control.c @@ -835,6 +835,7 @@ rspamd_srv_handler (gint fd, short what, gpointer ud) rdata->rep.id = cmd.id; rdata->rep.type = cmd.type; rdata->fd = -1; + worker->tmp_data = rdata; if (msg.msg_controllen >= CMSG_LEN (sizeof (int))) { rfd = *(int *) CMSG_DATA(CMSG_FIRSTHDR (&msg)); @@ -921,6 +922,7 @@ rspamd_srv_handler (gint fd, short what, gpointer ud) else if (what == EV_WRITE) { rdata = ud; worker = rdata->worker; + worker->tmp_data = NULL; /* Avoid race */ srv = rdata->srv; memset (&msg, 0, sizeof (msg)); @@ -967,6 +969,7 @@ rspamd_srv_start_watching (struct rspamd_main *srv, { g_assert (worker != NULL); + worker->tmp_data = NULL; event_set (&worker->srv_ev, worker->srv_pipe[0], EV_READ | EV_PERSIST, rspamd_srv_handler, worker); event_base_set (ev_base, &worker->srv_ev); |