session BUGFIX issues with timed locks

Author: Roytak

src/session.c

@@ -912,15 +912,18 @@ nc_session_free(struct nc_session *session, void (*data_free)(void *))
     }
 
     if ((session->side == NC_SERVER) && (session->flags & NC_SESSION_CALLHOME)) {
-        /* CH LOCK */
-        nc_mutex_lock(&session->opts.server.ch_lock, NC_SESSION_CH_LOCK_TIMEOUT, __func__);
+        /* CH LOCK, continue on error */
+        r = nc_mutex_lock(&session->opts.server.ch_lock, NC_SESSION_CH_LOCK_TIMEOUT, __func__);
     }
 
     status = session->status;
 
     if ((session->side == NC_SERVER) && (session->flags & NC_SESSION_CALLHOME)) {
         /* CH UNLOCK */
-        nc_mutex_unlock(&session->opts.server.ch_lock, __func__);
+        if (!r) {
+            /* only if we locked it */
+            nc_mutex_unlock(&session->opts.server.ch_lock, __func__);
+        }
     }
 
     if (status == NC_STATUS_CLOSING) {

src/session_client.c

@@ -3419,7 +3419,7 @@ nc_client_monitoring_thread(void *arg)
 
 next_iter:
         /* UNLOCK */
-        pthread_mutex_unlock(&mtarg->lock);
+        nc_mutex_unlock(&client_opts.monitoring_thread_data.lock, __func__);
         locked = 0;
 
         /* if an event occurred, call the callback */
@@ -3440,7 +3440,7 @@ nc_client_monitoring_thread(void *arg)
 cleanup:
     if (locked) {
         /* UNLOCK */
-        pthread_mutex_unlock(&mtarg->lock);
+        nc_mutex_unlock(&client_opts.monitoring_thread_data.lock, __func__);
     }
     VRB(NULL, "Client monitoring thread exit.");
     return NULL;
@@ -3524,7 +3524,7 @@ nc_client_monitoring_thread_stop(void)
     }
 
     /* UNLOCK */
-    pthread_mutex_unlock(&mtarg->lock);
+    nc_mutex_unlock(&client_opts.monitoring_thread_data.lock, __func__);
 
     r = pthread_join(tid, NULL);
     if (r) {
@@ -3550,7 +3550,7 @@ nc_client_monitoring_thread_stop(void)
     mtarg->pfds = NULL;
 
     /* UNLOCK */
-    pthread_mutex_unlock(&mtarg->lock);
+    nc_mutex_unlock(&client_opts.monitoring_thread_data.lock, __func__);
 }
 
 API void

src/session_server.c

@@ -2219,7 +2219,9 @@ nc_ps_poll_sess(struct nc_ps_session *ps_session, time_t now_mono)
 
             /* CONFIG READ LOCK */
             if (nc_rwlock_lock(&server_opts.config_lock, NC_RWLOCK_READ, NC_CONFIG_LOCK_TIMEOUT, __func__) != 1) {
+                ps_session->state = NC_PS_STATE_NONE;
                 ret = NC_PSPOLL_ERROR;
+                break;
             } else {
                 ret = nc_ps_poll_session_io(ps_session->session, NC_SESSION_LOCK_TIMEOUT, now_mono, msg);
                 /* CONFIG UNLOCK */
@@ -4358,7 +4360,10 @@ nc_server_notif_cert_exp_thread(void *arg)
             /* config changed, reload the certificates and intervals */
             nc_server_notif_cert_exp_data_destroy(exp_dates, exp_date_count, intervals);
 
-            nc_server_notif_cert_exp_intervals_get(default_intervals, 3, &intervals, &interval_count);
+            r = nc_server_notif_cert_exp_intervals_get(default_intervals, 3, &intervals, &interval_count);
+            if (r) {
+                break;
+            }
 
             r = nc_server_notif_cert_exp_dates_get(intervals, interval_count, &exp_dates, &exp_date_count);
             if (r) {