giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

C_Initialize() must copy CK_C_INITIALIZE_ARGS 

C_Initialize() must make a copy of the function pointers supplied
via pInitArgs, as the PKCS#11 specification makes no guarantee that
the pInitArgs pointer is allowed to be dereferenced after C_Initialize()
returns.

Fixes issue #2170.
This commit is contained in:
Stephan Mühlstrasser 2020-12-05 16:21:15 +01:00 committed by Frank Morgner
parent ffd6e2a576
commit 151583ce26
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pkcs11/pkcs11-global.c
View File

@ -156,6 +156,8 @@ static CK_C_INITIALIZE_ARGS _def_locks = {
#endif /* PKCS11_THREAD_LOCKING */ #endif /* PKCS11_THREAD_LOCKING */
static CK_C_INITIALIZE_ARGS_PTR global_locking; static CK_C_INITIALIZE_ARGS_PTR global_locking;
static CK_C_INITIALIZE_ARGS app_locking = {
NULL, NULL, NULL, NULL, 0, NULL };
static void *global_lock = NULL; static void *global_lock = NULL;
#ifdef HAVE_OS_LOCKING #ifdef HAVE_OS_LOCKING
static CK_C_INITIALIZE_ARGS_PTR default_mutex_funcs = &_def_locks; static CK_C_INITIALIZE_ARGS_PTR default_mutex_funcs = &_def_locks;
@ -914,6 +916,8 @@ sc_pkcs11_init_lock(CK_C_INITIALIZE_ARGS_PTR args)
if (args->pReserved != NULL_PTR) if (args->pReserved != NULL_PTR)
return CKR_ARGUMENTS_BAD; return CKR_ARGUMENTS_BAD;
app_locking = *args;
/* If the app tells us OS locking is okay, /* If the app tells us OS locking is okay,
* use that. Otherwise use the supplied functions. * use that. Otherwise use the supplied functions.
*/ */
@ -929,13 +933,13 @@ sc_pkcs11_init_lock(CK_C_INITIALIZE_ARGS_PTR args)
/* Based on PKCS#11 v2.11 11.4 */ /* Based on PKCS#11 v2.11 11.4 */
if (applock && oslock) { if (applock && oslock) {
/* Shall be used in threaded environment, prefer app provided locking */ /* Shall be used in threaded environment, prefer app provided locking */
global_locking = args; global_locking = &app_locking;
} else if (!applock && oslock) { } else if (!applock && oslock) {
/* Shall be used in threaded environment, must use operating system locking */ /* Shall be used in threaded environment, must use operating system locking */
global_locking = default_mutex_funcs; global_locking = default_mutex_funcs;
} else if (applock && !oslock) { } else if (applock && !oslock) {
/* Shall be used in threaded environment, must use app provided locking */ /* Shall be used in threaded environment, must use app provided locking */
global_locking = args; global_locking = &app_locking;
} else if (!applock && !oslock) { } else if (!applock && !oslock) {
/* Shall not be used in threaded environment, use operating system locking */ /* Shall not be used in threaded environment, use operating system locking */
global_locking = default_mutex_funcs; global_locking = default_mutex_funcs;