Attachment 637038 Details for Bug 872124 – proposed fix

[patch] proposed fix

0001-RHBZ-872124-fix-double-lock-in-PK11_Sign.patch (text/plain), 1.46 KB, created by Kamil Dudka on 2012-11-02 11:11:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kamil Dudka

Created: 2012-11-02 11:11:12 UTC

Size: 1.46 KB

patch

obsolete

>From 3cd8fe34d43464c8cb7bd986f851f2ca762c2512 Mon Sep 17 00:00:00 2001
>From: Kamil Dudka <kdudka@redhat.com>
>Date: Fri, 2 Nov 2012 12:06:36 +0100
>Subject: [PATCH] RHBZ#872124 - fix double-lock in PK11_Sign()
>
>---
> mozilla/security/nss/lib/pk11wrap/pk11obj.c |    3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
>diff --git a/mozilla/security/nss/lib/pk11wrap/pk11obj.c b/mozilla/security/nss/lib/pk11wrap/pk11obj.c
>index 7569d26..5fb47eb 100644
>--- a/mozilla/security/nss/lib/pk11wrap/pk11obj.c
>+++ b/mozilla/security/nss/lib/pk11wrap/pk11obj.c
>@@ -747,8 +747,8 @@ PK11_Sign(SECKEYPrivateKey *key, SECItem *sig, SECItem *hash)
>     session = pk11_GetNewSession(slot,&owner);
>     if (!owner || !(slot->isThreadSafe)) PK11_EnterSlotMonitor(slot);
>     crv = PK11_GETTAB(slot)->C_SignInit(session,&mech,key->pkcs11ID);
>+    if (!owner || !(slot->isThreadSafe)) PK11_ExitSlotMonitor(slot);
>     if (crv != CKR_OK) {
>-	if (!owner || !(slot->isThreadSafe)) PK11_ExitSlotMonitor(slot);
> 	pk11_CloseSession(slot,session,owner);
> 	PORT_SetError( PK11_MapError(crv) );
> 	return SECFailure;
>@@ -760,6 +760,7 @@ PK11_Sign(SECKEYPrivateKey *key, SECItem *sig, SECItem *hash)
> 		PK11_DoPassword(slot, PR_FALSE, key->wincx, PR_TRUE);
> 	}
>     len = sig->len;
>+    if (!owner || !(slot->isThreadSafe)) PK11_EnterSlotMonitor(slot);
>     crv = PK11_GETTAB(slot)->C_Sign(session,hash->data,
> 					hash->len, sig->data, &len);
>     if (!owner || !(slot->isThreadSafe)) PK11_ExitSlotMonitor(slot);
>-- 
>1.7.1
>

Flags:

rrelyea: review-

Actions: View | Diff

Attachments on bug 872124: 637038 | 637191