Always initialize session cache locks lazily.

net/third_party/nss/ssl/sslsock.c

 /*
  * vtables (and methods that call through them) for the 4 types of 
  * SSLSockets supported.  Only one type is still supported.
  * Various other functions.
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
@@ skipping 1379 matching lines @@
 {
     sslSocket * ns = NULL;
     PRStatus    rv;
     PRNetAddr   addr;
     SECStatus   status = ssl_Init();
 
     if (status != SECSuccess) {
         return NULL;
     }
 
+    /*
+     * The session cache locks (cacheLock in sslnonce.c and symWrapKeysLock
+     * in ssl3con.c) are always used when there is an sslSocket 'ss',
+     * except for SSL_ClearSessionCache and SSL3_ShutdownServerCache.  So
+     * we can lazily initialize the session cache locks right before we
+     * create an sslSocket.
+     */

[Ryan Sleevi, 2012/06/14 01:23:34]

See my other comment - I don't think this is correct/expected.

+    status = ssl_InitSessionCacheLocks();
+    if (status != SECSuccess) {
+        return NULL;
+    }
+
     if (model == NULL) {
         /* Just create a default socket if we're given NULL for the model */
         ns = ssl_NewSocket((PRBool)(!ssl_defaults.noLocks), variant);
     } else {
         sslSocket * ss = ssl_FindSocket(model);
         if (ss == NULL || ss->protocolVariant != variant) {
             SSL_DBG(("%d: SSL[%d]: bad model socket in ssl_ImportFD", 
                       SSL_GETPID(), model));
             return NULL;
         }
@@ skipping 1631 matching lines @@
             ssl_DestroySocketContents(ss);
             ssl_DestroyLocks(ss);
             PORT_Free(ss);
             ss = NULL;
         }
         ss->protocolVariant = protocolVariant;
     }
     return ss;
 }