Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-27 12:50:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bugzilla bug 248981: PKCS #11 modules that are based on older lib/ckfw (for

Browse Source 
example, the nssckbi module) save a pointer to the CK_C_INITIALIZE_ARGS
passed to them. So if we pass a pointer to the stack variable moduleArgs,
the pointer will point to a structure that has gone out of scope. To
prevent crashes in these broken modules, we continue to pass a pointer to
the global secmodLockFunctions whenever we can. r=relyea.
This commit is contained in:
wchang0222%aol.com 2004-07-08 23:23:50 +00:00
parent 10c62828bf
commit 409574ee15
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
security/nss/lib/pk11wrap/pk11load.c
View File

@ -142,6 +142,7 @@ SECMOD_LoadPKCS11Module(SECMODModule *mod) {
CK_INFO info;
CK_ULONG slotCount = 0;
CK_C_INITIALIZE_ARGS moduleArgs;
CK_VOID_PTR pInitArgs;
if (mod->loaded) return SECSuccess;
@ -227,13 +228,14 @@ SECMOD_LoadPKCS11Module(SECMODModule *mod) {
mod->isThreadSafe = PR_TRUE;
/* Now we initialize the module */
moduleArgs = secmodLockFunctions; /* use the default lock functions */
if (mod->libraryParams) {
moduleArgs = secmodLockFunctions;
moduleArgs.LibraryParameters = (void *) mod->libraryParams;
pInitArgs = &moduleArgs;
} else {
moduleArgs.LibraryParameters = NULL;
pInitArgs = (void *) &secmodLockFunctions;
}
if (PK11_GETTAB(mod)->C_Initialize(&moduleArgs) != CKR_OK) {
if (PK11_GETTAB(mod)->C_Initialize(pInitArgs) != CKR_OK) {
mod->isThreadSafe = PR_FALSE;
if (PK11_GETTAB(mod)->C_Initialize(NULL) != CKR_OK) goto fail;
}