ipcpd, irmd: Fix data races

Fixes a data race in the IRMd when IPCPs bail immediately after being
created (e.g. due to an error). Fixes a race between the acceptor
threads and the threads managed by threadpool manager upon shutdown.

1 files changed, 2 insertions, 3 deletions

diff --git a/src/ipcpd/ipcp.c b/src/ipcpd/ipcp.c
index 7066fb04..368c6eb8 100644
--- a/src/ipcpd/ipcp.c
+++ b/src/ipcpd/ipcp.c
@@ -58,8 +58,6 @@ void ipcp_sig_handler(int         sig,
                         if (ipcp_get_state() == IPCP_OPERATIONAL)
                                 ipcp_set_state(IPCP_SHUTDOWN);
                 }
-
-                tpm_stop();
         default:
                 return;
         }
@@ -689,8 +687,9 @@ int ipcp_boot()
 
 void ipcp_shutdown()
 {
-        tpm_fini();
         pthread_join(ipcpi.acceptor, NULL);
+        tpm_stop();
+        tpm_fini();
 
         log_info("IPCP %d shutting down.", getpid());
 }