summaryrefslogtreecommitdiff
path: root/src/irmd
diff options
context:
space:
mode:
authorDimitri Staessens <dimitri@ouroboros.rocks>2021-06-21 20:24:03 +0200
committerSander Vrijders <sander@ouroboros.rocks>2021-06-23 08:36:48 +0200
commit8ca960fa0274018cb4f94a1826029d74e6f762e0 (patch)
tree268ffb6b24027d65c738a8edd196a1ed52134fcc /src/irmd
parentac53f8ea09b9a24321bc2c00832ba8a117115134 (diff)
downloadouroboros-8ca960fa0274018cb4f94a1826029d74e6f762e0.tar.gz
ouroboros-8ca960fa0274018cb4f94a1826029d74e6f762e0.zip
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 <dimitri@ouroboros.rocks> Signed-off-by: Sander Vrijders <sander@ouroboros.rocks>
Diffstat (limited to 'src/irmd')
-rw-r--r--src/irmd/ipcp.c7
-rw-r--r--src/irmd/irm_flow.c4
-rw-r--r--src/irmd/main.c16
-rw-r--r--src/irmd/registry.c4
4 files changed, 10 insertions, 21 deletions
diff --git a/src/irmd/ipcp.c b/src/irmd/ipcp.c
index a6b0d20a..ae5325c5 100644
--- a/src/irmd/ipcp.c
+++ b/src/irmd/ipcp.c
@@ -44,11 +44,6 @@
#include <sys/time.h>
#include <spawn.h>
-static void close_ptr(void * o)
-{
- close(*(int *) o);
-}
-
ipcp_msg_t * send_recv_ipcp_msg(pid_t pid,
ipcp_msg_t * msg)
{
@@ -111,7 +106,7 @@ ipcp_msg_t * send_recv_ipcp_msg(pid_t pid,
(void *) &tv, sizeof(tv)))
log_warn("Failed to set timeout on socket.");
- pthread_cleanup_push(close_ptr, (void *) &sockfd);
+ pthread_cleanup_push(__cleanup_close_ptr, (void *) &sockfd);
ipcp_msg__pack(msg, buf);
diff --git a/src/irmd/irm_flow.c b/src/irmd/irm_flow.c
index 92bf74ef..75df7a80 100644
--- a/src/irmd/irm_flow.c
+++ b/src/irmd/irm_flow.c
@@ -29,6 +29,7 @@
#include <ouroboros/errno.h>
#include <ouroboros/logs.h>
#include <ouroboros/time_utils.h>
+#include <ouroboros/pthread.h>
#include "irm_flow.h"
@@ -195,8 +196,7 @@ int irm_flow_wait_state(struct irm_flow * f,
assert(f->state != FLOW_NULL);
- pthread_cleanup_push((void *)(void *) pthread_mutex_unlock,
- &f->state_lock);
+ pthread_cleanup_push(__cleanup_mutex_unlock, &f->state_lock);
while (!(f->state == state ||
f->state == FLOW_DESTROY ||
diff --git a/src/irmd/main.c b/src/irmd/main.c
index 31f244d9..471e9c36 100644
--- a/src/irmd/main.c
+++ b/src/irmd/main.c
@@ -45,6 +45,7 @@
#include <ouroboros/tpm.h>
#include <ouroboros/logs.h>
#include <ouroboros/version.h>
+#include <ouroboros/pthread.h>
#include "utils.h"
#include "registry.h"
@@ -58,7 +59,6 @@
#include <stdlib.h>
#include <string.h>
#include <limits.h>
-#include <pthread.h>
#include <sys/stat.h>
#include <sys/wait.h>
#include <spawn.h>
@@ -1969,11 +1969,6 @@ void * irm_sanitize(void * o)
}
}
-static void close_ptr(void * o)
-{
- close(*((int *) o));
-}
-
static void * acceptloop(void * o)
{
int csockfd;
@@ -2000,7 +1995,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);
@@ -2063,8 +2058,7 @@ static void * mainloop(void * o)
pthread_mutex_lock(&irmd.cmd_lock);
pthread_cleanup_push(free_msg, ret_msg);
- pthread_cleanup_push((void *)(void *) pthread_mutex_unlock,
- &irmd.cmd_lock);
+ pthread_cleanup_push(__cleanup_mutex_unlock, &irmd.cmd_lock);
while (list_is_empty(&irmd.cmds))
pthread_cond_wait(&irmd.cmd_cond, &irmd.cmd_lock);
@@ -2096,7 +2090,7 @@ static void * mainloop(void * o)
timeo = &ts;
}
- pthread_cleanup_push(close_ptr, &sfd);
+ pthread_cleanup_push(__cleanup_close_ptr, &sfd);
pthread_cleanup_push(free_msg, msg);
pthread_cleanup_push(free_msg, ret_msg);
@@ -2271,7 +2265,7 @@ static void * mainloop(void * o)
ret_msg->qosspec = NULL;
irm_msg__free_unpacked(ret_msg, NULL);
- pthread_cleanup_push(close_ptr, &sfd);
+ pthread_cleanup_push(__cleanup_close_ptr, &sfd);
if (write(sfd, buffer.data, buffer.len) == -1)
if (result != -EIRMD)
diff --git a/src/irmd/registry.c b/src/irmd/registry.c
index f0bd3e62..69e3ae97 100644
--- a/src/irmd/registry.c
+++ b/src/irmd/registry.c
@@ -33,6 +33,7 @@
#include <ouroboros/errno.h>
#include <ouroboros/logs.h>
#include <ouroboros/time_utils.h>
+#include <ouroboros/pthread.h>
#include "registry.h"
#include "utils.h"
@@ -431,8 +432,7 @@ int reg_entry_leave_state(struct reg_entry * e,
pthread_mutex_lock(&e->state_lock);
- pthread_cleanup_push((void *)(void *) pthread_mutex_unlock,
- &e->state_lock);
+ pthread_cleanup_push(__cleanup_mutex_unlock, &e->state_lock);
while (e->state == state && ret != -ETIMEDOUT)
if (timeout)