lib, ipcpd, irmd: Wrap pthread unlocks for cleanup

This add an ouroboros/pthread.h header that wraps the
pthread_..._unlock() functions for cleanup using
pthread_cleanup_push() as this casting is not safe (and there were
definitely bad casts in the code). The close() function is now also
wrapped for cleanup in ouroboros/sockets.h.
This allows enabling more compiler checks.

Signed-off-by: Dimitri Staessens <[email protected]>
Signed-off-by: Sander Vrijders <[email protected]>

8 files changed, 49 insertions, 61 deletions

diff --git a/src/ipcpd/broadcast/dt.c b/src/ipcpd/broadcast/dt.c
index 8b15008b..00476027 100644
--- a/src/ipcpd/broadcast/dt.c
+++ b/src/ipcpd/broadcast/dt.c
@@ -40,6 +40,7 @@
 #include <ouroboros/logs.h>
 #include <ouroboros/notifier.h>
 #include <ouroboros/utils.h>
+#include <ouroboros/pthread.h>
 
 #include "common/comp.h"
 #include "common/connmgr.h"
@@ -49,7 +50,6 @@
 #include <stdlib.h>
 #include <inttypes.h>
 #include <string.h>
-#include <pthread.h>
 
 struct nb {
         struct list_head next;
@@ -156,8 +156,7 @@ static void dt_packet(uint8_t * buf,
 
         pthread_rwlock_rdlock(&fwd.nbs_lock);
 
-        pthread_cleanup_push((void (*))(void *) pthread_rwlock_unlock,
-                             &fwd.nbs_lock);
+        pthread_cleanup_push(__cleanup_rwlock_unlock, &fwd.nbs_lock);
 
         list_for_each(p, &fwd.nbs) {
                 struct nb * nb = list_entry(p, struct nb, next);
@@ -168,6 +167,11 @@ static void dt_packet(uint8_t * buf,
         pthread_cleanup_pop(true);
 }
 
+static void __cleanup_fqueue_destroy(void * fq)
+{
+        fqueue_destroy((fqueue_t *) fq);
+}
+
 static void * dt_reader(void * o)
 {
         fqueue_t *   fq;
@@ -182,8 +186,7 @@ static void * dt_reader(void * o)
         if (fq == NULL)
                 return (void *) -1;
 
-        pthread_cleanup_push((void (*) (void *)) fqueue_destroy,
-                             (void *) fq);
+        pthread_cleanup_push(__cleanup_fqueue_destroy, (void *) fq);
 
         while (true) {
                 ret = fevent(fwd.set, fq, NULL);
diff --git a/src/ipcpd/common/connmgr.c b/src/ipcpd/common/connmgr.c
index 9002467c..53a66992 100644
--- a/src/ipcpd/common/connmgr.c
+++ b/src/ipcpd/common/connmgr.c
@@ -28,11 +28,11 @@
 #include <ouroboros/list.h>
 #include <ouroboros/logs.h>
 #include <ouroboros/notifier.h>
+#include <ouroboros/pthread.h>
 
 #include "connmgr.h"
 #include "ipcp.h"
 
-#include <pthread.h>
 #include <string.h>
 #include <stdlib.h>
 #include <assert.h>
@@ -493,8 +493,7 @@ int connmgr_wait(enum comp_id  id,
 
         pthread_mutex_lock(&comp->lock);
 
-        pthread_cleanup_push((void(*)(void *))pthread_mutex_unlock,
-                             (void *) &comp->lock);
+        pthread_cleanup_push(__cleanup_mutex_unlock, &comp->lock);
 
         while (list_is_empty(&comp->pending))
                 pthread_cond_wait(&comp->cond, &comp->lock);
diff --git a/src/ipcpd/eth/eth.c b/src/ipcpd/eth/eth.c
index 13a4a7e3..932034d5 100644
--- a/src/ipcpd/eth/eth.c
+++ b/src/ipcpd/eth/eth.c
@@ -48,13 +48,13 @@
 #include <ouroboros/logs.h>
 #include <ouroboros/time_utils.h>
 #include <ouroboros/fccntl.h>
+#include <ouroboros/pthread.h>
 
 #include "ipcp.h"
 #include "shim-data.h"
 
 #include <signal.h>
 #include <stdlib.h>
-#include <pthread.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <string.h>
@@ -807,8 +807,7 @@ static void * eth_ipcp_mgmt_handler(void * o)
 
         (void) o;
 
-        pthread_cleanup_push((void (*)(void *)) pthread_mutex_unlock,
-                             (void *) &eth_data.mgmt_lock);
+        pthread_cleanup_push(__cleanup_mutex_unlock, &eth_data.mgmt_lock);
 
         while (true) {
                 ret = 0;
@@ -1162,12 +1161,6 @@ static void change_flows_state(bool up)
         pthread_rwlock_unlock(&eth_data.flows_lock);
 }
 
-static void close_ptr(void * o)
-{
-        close(*((int *) o));
-}
-
-
 static void * eth_ipcp_if_monitor(void * o)
 {
         int                fd;
@@ -1188,7 +1181,7 @@ static void * eth_ipcp_if_monitor(void * o)
                 return (void *) -1;
         }
 
-        pthread_cleanup_push(close_ptr, &fd);
+        pthread_cleanup_push(__cleanup_close_ptr, &fd);
 
         while (true) {
                 status = recvmsg(fd, &msg, 0);
diff --git a/src/ipcpd/ipcp.c b/src/ipcpd/ipcp.c
index 8c9d3525..56cdb5d2 100644
--- a/src/ipcpd/ipcp.c
+++ b/src/ipcpd/ipcp.c
@@ -54,6 +54,7 @@
 #include <ouroboros/bitmap.h>
 #include <ouroboros/np1_flow.h>
 #include <ouroboros/rib.h>
+#include <ouroboros/pthread.h>
 
 #include "ipcp.h"
 
@@ -207,11 +208,6 @@ static struct rib_ops r_ops = {
         .getattr = ipcp_stat_getattr
 };
 
-static void close_ptr(void * o)
-{
-        close(*((int *) o));
-}
-
 static void * acceptloop(void * o)
 {
         int            csockfd;
@@ -239,7 +235,7 @@ static void * acceptloop(void * o)
                         break;
                 }
 
-                pthread_cleanup_push(close_ptr, &csockfd);
+                pthread_cleanup_push(__cleanup_close_ptr, &csockfd);
                 pthread_cleanup_push(free, cmd);
 
                 cmd->len = read(csockfd, cmd->cbuf, SOCK_BUF_SIZE);
@@ -295,8 +291,7 @@ static void * mainloop(void * o)
 
                 pthread_mutex_lock(&ipcpi.cmd_lock);
 
-                pthread_cleanup_push((void *)(void *) pthread_mutex_unlock,
-                                     &ipcpi.cmd_lock);
+                pthread_cleanup_push(__cleanup_mutex_unlock, &ipcpi.cmd_lock);
 
                 while (list_is_empty(&ipcpi.cmds))
                         pthread_cond_wait(&ipcpi.cmd_cond, &ipcpi.cmd_lock);
@@ -318,7 +313,7 @@ static void * mainloop(void * o)
 
                 tpm_dec(ipcpi.tpm);
 
-                pthread_cleanup_push(close_ptr, &sfd);
+                pthread_cleanup_push(__cleanup_close_ptr, &sfd);
                 pthread_cleanup_push(free_msg, msg);
 
                 switch (msg->code) {
@@ -665,7 +660,7 @@ static void * mainloop(void * o)
 
                 ipcp_msg__pack(&ret_msg, buffer.data);
 
-                pthread_cleanup_push(close_ptr, &sfd);
+                pthread_cleanup_push(__cleanup_close_ptr, &sfd);
 
                 if (write(sfd, buffer.data, buffer.len) == -1)
                         log_warn("Failed to send reply message");
@@ -955,8 +950,7 @@ int ipcp_wait_state(enum ipcp_state         state,
 
         pthread_mutex_lock(&ipcpi.state_mtx);
 
-        pthread_cleanup_push((void *)(void *) pthread_mutex_unlock,
-                             &ipcpi.state_mtx);
+        pthread_cleanup_push(__cleanup_mutex_unlock, &ipcpi.state_mtx);
 
         while (ipcpi.state != state
                && ipcpi.state != IPCP_SHUTDOWN
diff --git a/src/ipcpd/udp/main.c b/src/ipcpd/udp/main.c
index 13db0c1f..03de24ab 100644
--- a/src/ipcpd/udp/main.c
+++ b/src/ipcpd/udp/main.c
@@ -39,6 +39,7 @@
 #include <ouroboros/fqueue.h>
 #include <ouroboros/errno.h>
 #include <ouroboros/logs.h>
+#include <ouroboros/pthread.h>
 
 #include "ipcp.h"
 #include "shim-data.h"
@@ -51,7 +52,6 @@
 #include <netinet/in.h>
 #include <signal.h>
 #include <stdlib.h>
-#include <pthread.h>
 #include <sys/wait.h>
 #include <fcntl.h>
 
@@ -393,8 +393,7 @@ static void * ipcp_udp_mgmt_handler(void * o)
 {
         (void) o;
 
-        pthread_cleanup_push((void (*)(void *)) pthread_mutex_unlock,
-                             (void *) &udp_data.mgmt_lock);
+        pthread_cleanup_push(__cleanup_mutex_unlock, &udp_data.mgmt_lock);
 
         while (true) {
                 struct mgmt_frame * frame;
@@ -485,9 +484,14 @@ static void * ipcp_udp_packet_reader(void * o)
         return 0;
 }
 
-static void cleanup_writer(void * o)
+static void cleanup_fqueue(void * fq)
 {
-        fqueue_destroy((fqueue_t *) o);
+        fqueue_destroy((fqueue_t *) fq);
+}
+
+static void cleanup_sdb(void * sdb)
+{
+        ipcp_sdb_release((struct shm_du_buff *) sdb);
 }
 
 static void * ipcp_udp_packet_writer(void * o)
@@ -502,7 +506,7 @@ static void * ipcp_udp_packet_writer(void * o)
 
         ipcp_lock_to_core();
 
-        pthread_cleanup_push(cleanup_writer, fq);
+        pthread_cleanup_push(cleanup_fqueue, fq);
 
         while (true) {
                 struct sockaddr_in saddr;
@@ -545,8 +549,7 @@ static void * ipcp_udp_packet_writer(void * o)
 
                         memcpy(buf, &eid, sizeof(eid));
 
-                        pthread_cleanup_push((void (*)(void *))
-                                             ipcp_sdb_release, (void *) sdb);
+                        pthread_cleanup_push(cleanup_sdb, sdb);
 
                         if (sendto(udp_data.s_fd, buf, len + OUR_HEADER_LEN,
                                    MSG_CONFIRM,
diff --git a/src/ipcpd/unicast/dht.c b/src/ipcpd/unicast/dht.c
index 3dc592db..2b668f9f 100644
--- a/src/ipcpd/unicast/dht.c
+++ b/src/ipcpd/unicast/dht.c
@@ -42,12 +42,12 @@
 #include <ouroboros/time_utils.h>
 #include <ouroboros/tpm.h>
 #include <ouroboros/utils.h>
+#include <ouroboros/pthread.h>
 
 #include "common/connmgr.h"
 #include "dht.h"
 #include "dt.h"
 
-#include <pthread.h>
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
@@ -308,8 +308,7 @@ int dht_wait_running(struct dht * dht)
 
         pthread_mutex_lock(&dht->mtx);
 
-        pthread_cleanup_push((void *)(void *) pthread_mutex_unlock,
-                             &dht->mtx);
+        pthread_cleanup_push(__cleanup_mutex_unlock, &dht->mtx);
 
         while (dht->state == DHT_JOINING)
                 pthread_cond_wait(&dht->cond, &dht->mtx);
@@ -466,8 +465,7 @@ static int kad_req_wait(struct kad_req * req,
 
         req->state = REQ_PENDING;
 
-        pthread_cleanup_push((void *)(void *) pthread_mutex_unlock,
-                             &req->lock);
+        pthread_cleanup_push(__cleanup_mutex_unlock, &req->lock);
 
         while (req->state == REQ_PENDING && ret != -ETIMEDOUT)
                 ret = -pthread_cond_timedwait(&req->cond, &req->lock, &abs);
@@ -819,8 +817,7 @@ static void lookup_update(struct dht *    dht,
                 return;
         }
 
-        pthread_cleanup_push((void *)(void *) pthread_mutex_unlock,
-                             &lu->lock);
+        pthread_cleanup_push(__cleanup_mutex_unlock, &lu->lock);
 
         while (lu->state == LU_INIT) {
                 pthread_rwlock_unlock(&dht->lock);
@@ -967,7 +964,7 @@ static void lookup_set_state(struct lookup *   lu,
         pthread_mutex_unlock(&lu->lock);
 }
 
-static void cleanup_wait(void * o)
+static void cancel_lookup_wait(void * o)
 {
         struct lookup * lu = (struct lookup *) o;
         lu->state = LU_NULL;
@@ -991,7 +988,7 @@ static enum lookup_state lookup_wait(struct lookup * lu)
         if (lu->state == LU_INIT || lu->state == LU_UPDATE)
                 lu->state = LU_PENDING;
 
-        pthread_cleanup_push(cleanup_wait, lu);
+        pthread_cleanup_push(cancel_lookup_wait, lu);
 
         while (lu->state == LU_PENDING && ret != -ETIMEDOUT)
                 ret = -pthread_cond_timedwait(&lu->cond, &lu->lock, &abs);
@@ -2421,8 +2418,7 @@ static void * dht_handle_packet(void * o)
 
                 pthread_mutex_lock(&dht->mtx);
 
-                pthread_cleanup_push((void *)(void *) pthread_mutex_unlock,
-                                     &dht->mtx);
+                pthread_cleanup_push(__cleanup_mutex_unlock, &dht->mtx);
 
                 while (list_is_empty(&dht->cmds))
                         pthread_cond_wait(&dht->cond, &dht->mtx);
diff --git a/src/ipcpd/unicast/fa.c b/src/ipcpd/unicast/fa.c
index b3b9b42c..3ebdc1f1 100644
--- a/src/ipcpd/unicast/fa.c
+++ b/src/ipcpd/unicast/fa.c
@@ -38,6 +38,7 @@
 #include <ouroboros/ipcp-dev.h>
 #include <ouroboros/rib.h>
 #include <ouroboros/random.h>
+#include <ouroboros/pthread.h>
 
 #include "dir.h"
 #include "fa.h"
@@ -47,7 +48,6 @@
 #include "ca.h"
 
 #include <inttypes.h>
-#include <pthread.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -442,8 +442,7 @@ static void * fa_handle_packet(void * o)
 
                 pthread_mutex_lock(&fa.mtx);
 
-                pthread_cleanup_push((void (*)(void *)) pthread_mutex_unlock,
-                                     &fa.mtx);
+                pthread_cleanup_push(__cleanup_mutex_unlock, &fa.mtx);
 
                 while (list_is_empty(&fa.cmds))
                         pthread_cond_wait(&fa.cond, &fa.mtx);
diff --git a/src/ipcpd/unicast/pol/link_state.c b/src/ipcpd/unicast/pol/link_state.c
index e8983ec6..cca85d63 100644
--- a/src/ipcpd/unicast/pol/link_state.c
+++ b/src/ipcpd/unicast/pol/link_state.c
@@ -38,6 +38,7 @@
 #include <ouroboros/list.h>
 #include <ouroboros/logs.h>
 #include <ouroboros/notifier.h>
+#include <ouroboros/pthread.h>
 #include <ouroboros/rib.h>
 #include <ouroboros/utils.h>
 
@@ -52,7 +53,6 @@
 #include <stdlib.h>
 #include <inttypes.h>
 #include <string.h>
-#include <pthread.h>
 
 #define RECALC_TIME    4
 #define LS_UPDATE_TIME 15
@@ -648,8 +648,7 @@ static void * lsupdate(void * o)
 
                 pthread_rwlock_wrlock(&ls.db_lock);
 
-                pthread_cleanup_push((void (*) (void *)) pthread_rwlock_unlock,
-                                     (void *) &ls.db_lock);
+                pthread_cleanup_push(__cleanup_rwlock_unlock, &ls.db_lock);
 
                 list_for_each_safe(p, h, &ls.db) {
                         struct adjacency * adj;
@@ -709,8 +708,7 @@ static void forward_lsm(uint8_t * buf,
 
         pthread_rwlock_rdlock(&ls.db_lock);
 
-        pthread_cleanup_push((void (*))(void *) pthread_rwlock_unlock,
-                             &ls.db_lock);
+        pthread_cleanup_push(__cleanup_rwlock_unlock, &ls.db_lock);
 
         list_for_each(p, &ls.nbs) {
                 struct nb * nb = list_entry(p, struct nb, next);
@@ -721,6 +719,11 @@ static void forward_lsm(uint8_t * buf,
         pthread_cleanup_pop(true);
 }
 
+static void cleanup_fqueue(void * fq)
+{
+        fqueue_destroy((fqueue_t *) fq);
+}
+
 static void * lsreader(void * o)
 {
         fqueue_t *   fq;
@@ -739,8 +742,7 @@ static void * lsreader(void * o)
         if (fq == NULL)
                 return (void *) -1;
 
-        pthread_cleanup_push((void (*) (void *)) fqueue_destroy,
-                             (void *) fq);
+        pthread_cleanup_push(cleanup_fqueue, fq);
 
         while (true) {
                 ret = fevent(ls.mgmt_set, fq, NULL);
@@ -813,8 +815,7 @@ static void handle_event(void *       self,
         case NOTIFY_DT_CONN_ADD:
                 pthread_rwlock_rdlock(&ls.db_lock);
 
-                pthread_cleanup_push((void (*) (void *)) pthread_rwlock_unlock,
-                                     (void *) &ls.db_lock);
+                pthread_cleanup_push(__cleanup_rwlock_unlock, &ls.db_lock);
 
                 send_lsm(ipcpi.dt_addr, c->conn_info.addr, 0);
                 pthread_cleanup_pop(true);