wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-26 00:57:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

import changes from mozilla nss repo:

Browse source 
- Bug 1682863 - Revert nssSlot_IsTokenPresent to 3.58 after ongoing Fx hangs with slow PKCS11 devices. r=bbeurdouche
- Bug 1680400 - Fix memory leak in PK11_UnwrapPrivKey. r=bbeurdouche
This commit is contained in:
roytam1 2020-12-30 08:33:37 +08:00
commit c082741e8a
2 changed files with 12 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

36
security/nss/lib/dev/devslot.c
View file

@ -171,12 +171,11 @@ nssSlot_IsTokenPresent(
nssSlot_EnterMonitor(slot); nssSlot_EnterMonitor(slot);
ckrv = CKAPI(epv)->C_GetSlotInfo(slot->slotID, &slotInfo); ckrv = CKAPI(epv)->C_GetSlotInfo(slot->slotID, &slotInfo);
nssSlot_ExitMonitor(slot);
if (ckrv != CKR_OK) { if (ckrv != CKR_OK) {
if (slot->token) { slot->token->base.name[0] = 0; /* XXX */
slot->token->base.name[0] = 0; /* XXX */
}
isPresent = PR_FALSE; isPresent = PR_FALSE;
goto done; /* slot lock held */ goto done;
} }
slot->ckFlags = slotInfo.flags; slot->ckFlags = slotInfo.flags;
/* check for the presence of the token */ /* check for the presence of the token */
@ -184,11 +183,10 @@ nssSlot_IsTokenPresent(
if (!slot->token) { if (!slot->token) {
/* token was never present */ /* token was never present */
isPresent = PR_FALSE; isPresent = PR_FALSE;
goto done; /* slot lock held */ goto done;
} }
session = nssToken_GetDefaultSession(slot->token); session = nssToken_GetDefaultSession(slot->token);
if (session) { if (session) {
nssSlot_ExitMonitor(slot);
nssSession_EnterMonitor(session); nssSession_EnterMonitor(session);
/* token is not present */ /* token is not present */
if (session->handle != CK_INVALID_SESSION) { if (session->handle != CK_INVALID_SESSION) {
@ -198,12 +196,6 @@ nssSlot_IsTokenPresent(
session->handle = CK_INVALID_SESSION; session->handle = CK_INVALID_SESSION;
} }
nssSession_ExitMonitor(session); nssSession_ExitMonitor(session);
nssSlot_EnterMonitor(slot);
if (!slot->token) {
/* Check token presence after re-acquiring lock */
isPresent = PR_FALSE;
goto done; /* slot lock held */
}
} }
if (slot->token->base.name[0] != 0) { if (slot->token->base.name[0] != 0) {
/* notify the high-level cache that the token is removed */ /* notify the high-level cache that the token is removed */
@ -214,23 +206,14 @@ nssSlot_IsTokenPresent(
/* clear the token cache */ /* clear the token cache */
nssToken_Remove(slot->token); nssToken_Remove(slot->token);
isPresent = PR_FALSE; isPresent = PR_FALSE;
goto done; /* slot lock held */ goto done;
} }
if (!slot->token) {
/* This should not occur, based on the fact that the
* below calls will dereference NULL otherwise. */
PORT_Assert(0);
isPresent = PR_FALSE;
goto done; /* slot lock held */
}
/* token is present, use the session info to determine if the card /* token is present, use the session info to determine if the card
* has been removed and reinserted. * has been removed and reinserted.
*/ */
session = nssToken_GetDefaultSession(slot->token); session = nssToken_GetDefaultSession(slot->token);
if (session) { if (session) {
PRBool tokenRemoved; PRBool tokenRemoved;
nssSlot_ExitMonitor(slot);
nssSession_EnterMonitor(session); nssSession_EnterMonitor(session);
if (session->handle != CK_INVALID_SESSION) { if (session->handle != CK_INVALID_SESSION) {
CK_SESSION_INFO sessionInfo; CK_SESSION_INFO sessionInfo;
@ -244,16 +227,10 @@ nssSlot_IsTokenPresent(
} }
tokenRemoved = (session->handle == CK_INVALID_SESSION); tokenRemoved = (session->handle == CK_INVALID_SESSION);
nssSession_ExitMonitor(session); nssSession_ExitMonitor(session);
nssSlot_EnterMonitor(slot);
/* token not removed, finished */ /* token not removed, finished */
if (!tokenRemoved) { if (!tokenRemoved) {
isPresent = PR_TRUE; isPresent = PR_TRUE;
goto done; /* slot lock held */ goto done;
}
if (!slot->token) {
/* Check token presence after re-acquiring lock */
isPresent = PR_FALSE;
goto done; /* slot lock held */
} }
} }
/* the token has been removed, and reinserted, or the slot contains /* the token has been removed, and reinserted, or the slot contains
@ -271,7 +248,6 @@ nssSlot_IsTokenPresent(
isPresent = PR_FALSE; isPresent = PR_FALSE;
} }
done: done:
nssSlot_ExitMonitor(slot);
/* Once we've set up the condition variable, /* Once we've set up the condition variable,
* Before returning, it's necessary to: * Before returning, it's necessary to:
* 1) Set the lastTokenPingTime so that any other threads waiting on this * 1) Set the lastTokenPingTime so that any other threads waiting on this

12
security/nss/lib/pk11wrap/pk11obj.c
View file

@ -1320,23 +1320,23 @@ PK11_UnwrapPrivKey(PK11SlotInfo *slot, PK11SymKey *wrappingKey,
NULL, perm, sensitive); NULL, perm, sensitive);
SECKEY_DestroyPrivateKey(privKey); SECKEY_DestroyPrivateKey(privKey);
PK11_FreeSlot(int_slot); PK11_FreeSlot(int_slot);
SECITEM_FreeItem(param_free, PR_TRUE);
return newPrivKey; return newPrivKey;
} }
} }
if (int_slot) if (int_slot)
PK11_FreeSlot(int_slot); PK11_FreeSlot(int_slot);
PORT_SetError(PK11_MapError(crv)); PORT_SetError(PK11_MapError(crv));
SECITEM_FreeItem(param_free, PR_TRUE);
return NULL; return NULL;
} }
SECITEM_FreeItem(param_free, PR_TRUE);
return PK11_MakePrivKey(slot, nullKey, PR_FALSE, privKeyID, wincx); return PK11_MakePrivKey(slot, nullKey, PR_FALSE, privKeyID, wincx);
loser: loser:
if (newKey) { PK11_FreeSymKey(newKey);
PK11_FreeSymKey(newKey); SECITEM_FreeItem(ck_id, PR_TRUE);
} SECITEM_FreeItem(param_free, PR_TRUE);
if (ck_id) {
SECITEM_FreeItem(ck_id, PR_TRUE);
}
return NULL; return NULL;
} }