Changeset 5343

Timestamp:

Jun 14, 2016 10:28:19 AM (8 years ago)

Author:

ming

Message:

Re #1930: Fixed race condition when more than one thread try to close the same activesock.

File:

• pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c (modified) (4 diffs)

pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c

@@ -813 +813 @@
 static void close_sockets(pj_ssl_sock_t *ssock)
 {
-    if (ssock->asock) {
-        pj_activesock_close(ssock->asock);
-        ssock->asock = NULL;
-        ssock->sock = PJ_INVALID_SOCKET;
-    }
-    if (ssock->sock != PJ_INVALID_SOCKET) {
-        pj_sock_close(ssock->sock);
-        ssock->sock = PJ_INVALID_SOCKET;
-    }
+    pj_activesock_t *asock;
+    pj_sock_t sock;
+
+    /* This can happen when pj_ssl_sock_create() fails. */
+    if (!ssock->write_mutex)
+        return;
+
+    pj_lock_acquire(ssock->write_mutex);
+    asock = ssock->asock;
+    if (asock) {
+        ssock->asock = NULL;
+        ssock->sock = PJ_INVALID_SOCKET;
+    }
+    sock = ssock->sock;
+    if (sock != PJ_INVALID_SOCKET)
+        ssock->sock = PJ_INVALID_SOCKET;
+    pj_lock_release(ssock->write_mutex);
+
+    if (asock)
+        pj_activesock_close(asock);
+
+    if (sock != PJ_INVALID_SOCKET)
+        pj_sock_close(sock);
 }
 
@@ -1946 +1960 @@
                                         &ssock->timer,
                                         &ssock->param.timeout);
-        if (status != PJ_SUCCESS)
+        if (status != PJ_SUCCESS) {
             ssock->timer.id = TIMER_NONE;
+            status = PJ_SUCCESS;
+        }
     }
 
@@ -1953 +1969 @@
     ssock->ssl_state = SSL_STATE_HANDSHAKING;
     SSL_set_accept_state(ssock->ossl_ssl);
-    status = do_handshake(ssock);
+    //To avoid race condition, we don't need to do it here and
+    //let the handshake happen in ssock->asock's callback instead.
+    //status = do_handshake(ssock);
 
 on_return:
-    if (ssock && status != PJ_EPENDING)
-        on_handshake_complete(ssock, status);
+    if (ssock && status != PJ_SUCCESS) {
+        //on_handshake_complete(ssock, status);
+        close_sockets(ssock);
+    }
 
     /* Must return PJ_TRUE whatever happened, as active socket must 
@@ -2864 +2884 @@
                                         &ssock->timer,
                                         &ssock->param.timeout);
-        if (status != PJ_SUCCESS)
+        if (status != PJ_SUCCESS) {
             ssock->timer.id = TIMER_NONE;
+            status = PJ_SUCCESS;
+        }
     }