Attachment 928882 Details for Bug 1099619 – fix regresssion caused by the previous fix

[patch] fix regresssion caused by the previous fix

nss-3.16.1-pem_deadlock.patch (text/plain), 2.61 KB, created by Elio Maldonado Batiz on 2014-08-20 16:31:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Elio Maldonado Batiz

Created: 2014-08-20 16:31:12 UTC

Size: 2.61 KB

patch

obsolete

>diff -up ./nss/lib/pk11wrap/pk11util.c.pem_deadlock ./nss/lib/pk11wrap/pk11util.c
>--- ./nss/lib/pk11wrap/pk11util.c.pem_deadlock	2014-08-19 14:39:36.533509493 -0700
>+++ ./nss/lib/pk11wrap/pk11util.c	2014-08-19 14:49:16.063509272 -0700
>@@ -1263,7 +1263,7 @@ SECMOD_HasRemovableSlots(SECMODModule *m
>  */
> static SECStatus
> secmod_UserDBOp(PK11SlotInfo *slot, CK_OBJECT_CLASS objClass, 
>-		const char *sendSpec)
>+		const char *sendSpec, PRBool needlock)
> {
>     CK_OBJECT_HANDLE dummy;
>     CK_ATTRIBUTE template[2] ;
>@@ -1277,10 +1277,10 @@ secmod_UserDBOp(PK11SlotInfo *slot, CK_O
>     PORT_Assert(attrs-template <= 2);
> 
> 
>-    PK11_EnterSlotMonitor(slot);
>+    if (needlock) PK11_EnterSlotMonitor(slot);
>     crv = PK11_CreateNewObject(slot, slot->session,
> 	template, attrs-template, PR_FALSE, &dummy);
>-    PK11_ExitSlotMonitor(slot);
>+    if (needlock) PK11_ExitSlotMonitor(slot);
> 
>     if (crv != CKR_OK) {
> 	PORT_SetError(PK11_MapError(crv));
>@@ -1300,10 +1300,11 @@ secmod_SlotIsEmpty(SECMODModule *mod,  C
> 	CK_SLOT_INFO slotInfo;
> 	CK_RV crv;
> 	/* check if the slot is present, skip any slot reinit stuff,
>-	 * or cached present values */
>-	if (!slot->isThreadSafe) PK11_EnterSlotMonitor(slot);
>+	 * or cached present values, or locking. (we don't need to lock 
>+	 * even if the module is not thread safe because we are already 
>+	 * holding the module refLock, which is the same as the slot 
>+	 * sessionLock if the module isn't thread safe. */
> 	crv = PK11_GETTAB(slot)->C_GetSlotInfo(slot->slotID,&slotInfo);
>-        if (!slot->isThreadSafe) PK11_ExitSlotMonitor(slot);
> 	PK11_FreeSlot(slot);
> 	if ((crv == CKR_OK) && 
> 		((slotInfo.flags & CKF_TOKEN_PRESENT) == CKF_TOKEN_PRESENT)) {
>@@ -1399,7 +1400,11 @@ SECMOD_OpenNewSlot(SECMODModule *mod, co
> 	PORT_SetError(SEC_ERROR_NO_MEMORY);
> 	return NULL;
>     }
>-    rv = secmod_UserDBOp(slot, CKO_NETSCAPE_NEWSLOT, sendSpec);
>+    rv = secmod_UserDBOp(slot, CKO_NETSCAPE_NEWSLOT, sendSpec, 
>+    /* If the module isn't thread safe, the slot sessionLock == mod->refLock
>+     * since we already hold the refLock we don't need to lock the sessionLock
>+     */
>+							mod->isThreadSafe);
>     PZ_Unlock(mod->refLock);
>     PR_smprintf_free(sendSpec);
>     PK11_FreeSlot(slot);
>@@ -1512,7 +1517,7 @@ SECMOD_CloseUserDB(PK11SlotInfo *slot)
> 	PORT_SetError(SEC_ERROR_NO_MEMORY);
> 	return SECFailure;
>     }
>-    rv = secmod_UserDBOp(slot, CKO_NETSCAPE_DELSLOT, sendSpec);
>+    rv = secmod_UserDBOp(slot, CKO_NETSCAPE_DELSLOT, sendSpec, PR_TRUE);
>     PR_smprintf_free(sendSpec);
>     /* if we are in the delay period for the "isPresent" call, reset
>      * the delay since we know things have probably changed... */

Actions: View | Diff

Attachments on bug 1099619: 898508 | 898509 | 898716 | 903189 | 913569 | 928882 | 928886 | 928887