diff options
| author | Stef Walter <stef@thewalter.net> | 2014-08-07 07:47:00 +0200 |
|---|---|---|
| committer | Stef Walter <stef@thewalter.net> | 2014-08-07 07:53:17 +0200 |
| commit | c61187f879395bb334edba39ee6dfb91f1a9e59b (patch) | |
| tree | 9c6e09cea0f32142f6fee98167e8f2a193a36983 | |
| parent | 8e132ab21378fb5fa1f44afb38c23f44b1277f7d (diff) | |
p11-kit: Don't complain about C_Finalize called in wrong process
When C_Finalize is called in the wrong process, it's often because
of a caller unaware of forking. This is a painful area of PKCS#11,
but at least for C_Finalize, lets not complain loudly about it.
| -rw-r--r-- | p11-kit/modules.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/p11-kit/modules.c b/p11-kit/modules.c index bfcd3e5..293ea4d 100644 --- a/p11-kit/modules.c +++ b/p11-kit/modules.c @@ -1591,7 +1591,14 @@ managed_C_Finalize (CK_X_FUNCTION_LIST *self, pid = getpid (); if (managed->initialized != pid) { - rv = CKR_CRYPTOKI_NOT_INITIALIZED; + /* + * In theory we should be returning CKR_CRYPTOKI_NOT_INITIALIZED here + * but enough callers are not completely aware of their forking. + * So we just clean up any state we have, rather than forcing callers + * to initialize just to finalize. + */ + p11_debug ("finalizing module in wrong process, skipping C_Finalize"); + rv = CKR_OK; } else { sessions = managed_steal_sessions_inlock (managed->sessions, false, 0, &count); @@ -1607,12 +1614,12 @@ managed_C_Finalize (CK_X_FUNCTION_LIST *self, /* WARNING: reentrancy can occur here */ rv = finalize_module_inlock_reentrant (managed->mod); + } - if (rv == CKR_OK) { - managed->initialized = 0; - p11_dict_free (managed->sessions); - managed->sessions = NULL; - } + if (rv == CKR_OK) { + managed->initialized = 0; + p11_dict_free (managed->sessions); + managed->sessions = NULL; } p11_unlock (); |