Bug 1766978 - improve error handling after nssCKFWInstance_CreateObjectHandle. r=djacksonNSS_3_79_BETA1

Differential Revision: https://phabricator.services.mozilla.com/D146765

1 files changed, 11 insertions, 5 deletions

diff --git a/lib/ckfw/wrap.c b/lib/ckfw/wrap.c
index 44c2e8e5b..624d9cee3 100644
--- a/lib/ckfw/wrap.c
+++ b/lib/ckfw/wrap.c
@@ -2570,11 +2570,17 @@ NSSCKFWC_FindObjects(
         phObject[i] = nssCKFWInstance_FindObjectHandle(fwInstance, fwObject);
         if ((CK_OBJECT_HANDLE)0 == phObject[i]) {
             phObject[i] = nssCKFWInstance_CreateObjectHandle(fwInstance, fwObject, &error);
-        }
-        if ((CK_OBJECT_HANDLE)0 == phObject[i]) {
-            /* This isn't right either, is it? */
-            nssCKFWObject_Destroy(fwObject);
-            goto loser;
+            /* CreateObjectHandle returns CKR_GENERAL_ERROR if fwObject already
+             * has a handle. This happens when another thread creates a handle
+             * between our FindObjectHandle and CreateObjectHandle calls.
+             */
+            if (error == CKR_GENERAL_ERROR) {
+                error = CKR_OK;
+                phObject[i] = nssCKFWInstance_FindObjectHandle(fwInstance, fwObject);
+            }
+            if (error != CKR_OK || (CK_OBJECT_HANDLE)0 == phObject[i]) {
+                goto loser;
+            }
         }
     }