diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2019-04-01 15:58:03 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2019-04-01 15:58:03 +0000 |
| commit | 16e45ee494a33f343b7ced1debeb773588b9f2bd (patch) | |
| tree | fc84b6fd4f4418b9b68ad7ce42f2f74f2b2b2dce /lib/libtls/tls_config.c | |
| parent | 16da4f8be43cedc6539c84a30ac91ec6ad9ca75c (diff) | |
Add a mutex to guard reference counting for tls_config.
This makes libtls more friendly for multithreaded use - otherwise we can
end up with incorrect refcounts and end up freeing when we should not be
(or not freeing when we should be).
ok beck@
Diffstat (limited to 'lib/libtls/tls_config.c')
| -rw-r--r-- | lib/libtls/tls_config.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/libtls/tls_config.c b/lib/libtls/tls_config.c index 19dcc8b0d04..62361e61224 100644 --- a/lib/libtls/tls_config.c +++ b/lib/libtls/tls_config.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tls_config.c,v 1.54 2019/03/27 11:12:10 tedu Exp $ */ +/* $OpenBSD: tls_config.c,v 1.55 2019/04/01 15:58:02 jsing Exp $ */ /* * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> * @@ -20,6 +20,7 @@ #include <ctype.h> #include <errno.h> #include <fcntl.h> +#include <pthread.h> #include <stdlib.h> #include <unistd.h> @@ -96,6 +97,7 @@ tls_config_new_internal(void) if ((config->keypair = tls_keypair_new()) == NULL) goto err; + config->mutex = PTHREAD_MUTEX_INITIALIZER; config->refcount = 1; config->session_fd = -1; @@ -149,11 +151,16 @@ void tls_config_free(struct tls_config *config) { struct tls_keypair *kp, *nkp; + int refcount; if (config == NULL) return; - if (--config->refcount > 0) + pthread_mutex_lock(&config->mutex); + refcount = --config->refcount; + pthread_mutex_unlock(&config->mutex); + + if (refcount > 0) return; for (kp = config->keypair; kp != NULL; kp = nkp) { |