From: Kamil Dudka <kdudka@redhat.com>
Date: Mon, 24 Apr 2017 13:01:04 +0000 (+0200)
Subject: nss: do not leak PKCS #11 slot while loading a key
X-Git-Tag: curl-7_54_1~229
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c8ea86f377a2f341db635ec96f99314023b5a8f3;p=curl

nss: do not leak PKCS #11 slot while loading a key

It could prevent nss-pem from being unloaded later on.

Bug: https://bugzilla.redhat.com/1444860
---

diff --git a/lib/vtls/nss.c b/lib/vtls/nss.c
index e1a122947..0e57ab45d 100644
--- a/lib/vtls/nss.c
+++ b/lib/vtls/nss.c
@@ -603,7 +603,7 @@ fail:
 static CURLcode nss_load_key(struct connectdata *conn, int sockindex,
                              char *key_file)
 {
-  PK11SlotInfo *slot;
+  PK11SlotInfo *slot, *tmp;
   SECStatus status;
   CURLcode result;
   struct ssl_connect_data *ssl = conn->ssl;
@@ -622,7 +622,9 @@ static CURLcode nss_load_key(struct connectdata *conn, int sockindex,
     return CURLE_SSL_CERTPROBLEM;
 
   /* This will force the token to be seen as re-inserted */
-  SECMOD_WaitForAnyTokenEvent(mod, 0, 0);
+  tmp = SECMOD_WaitForAnyTokenEvent(mod, 0, 0);
+  if(tmp)
+    PK11_FreeSlot(tmp);
   PK11_IsPresent(slot);
 
   status = PK11_Authenticate(slot, PR_TRUE, SSL_SET_OPTION(key_passwd));