diff options
author | Dimitri Staessens <dimitri@ouroboros.rocks> | 2022-05-21 16:17:10 +0200 |
---|---|---|
committer | Sander Vrijders <sander@ouroboros.rocks> | 2022-05-22 15:11:22 +0200 |
commit | 072f555c07318a946cd2131b9b261d11a96fbbf8 (patch) | |
tree | d9d804697aea5574ff626ce78de3888062a05502 /src/ipcpd/udp/main.c | |
parent | bec8f9ac7d6ebefbce6bd4c882c0f9616f561f1c (diff) | |
download | ouroboros-072f555c07318a946cd2131b9b261d11a96fbbf8.tar.gz ouroboros-072f555c07318a946cd2131b9b261d11a96fbbf8.zip |
ipcpd: Fix deadlock on exit in udp, local, eth
The IPCP flow_set was getting destroyed with the IPCP main loop still
running, causing potential deadlocks.
Reported-by: Thijs Paelman
Confirmed-by: Dimitri Staessens <dimitri@ouroboros.rocks>
Tested-by: Dimitri Staessens <dimitri@ouroboros.rocks>
Signed-off-by: Dimitri Staessens <dimitri@ouroboros.rocks>
Signed-off-by: Sander Vrijders <sander@ouroboros.rocks>
Diffstat (limited to 'src/ipcpd/udp/main.c')
-rw-r--r-- | src/ipcpd/udp/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ipcpd/udp/main.c b/src/ipcpd/udp/main.c index 601efa5c..9960f880 100644 --- a/src/ipcpd/udp/main.c +++ b/src/ipcpd/udp/main.c @@ -1163,10 +1163,10 @@ int main(int argc, pthread_join(udp_data.mgmt_handler, NULL); } - udp_data_fini(); - ipcp_fini(); + udp_data_fini(); + exit(EXIT_SUCCESS); fail_create_r: ipcp_set_state(IPCP_NULL); |