diff options
| author | Stef Walter <stef@thewalter.net> | 2014-07-03 10:26:16 +0200 |
|---|---|---|
| committer | Stef Walter <stef@thewalter.net> | 2014-07-04 14:23:15 +0200 |
| commit | 25e8999fd11d0b2c156f3bdd8597142dedd042cb (patch) | |
| tree | a4b76d584756f8ede20d9d29766e9eea6defb0c9 /p11-kit/modules.c | |
| parent | a2bd1a8c5ba3c611899f7dfc27d553010899eeec (diff) | |
p11-kit: Handle managed modules correctly when forking
Correctly allow reinitialization when a process forks.
We don't yet implement checks on all entry points of a managed
module, but this allows callers to call C_Initialize again
after forking, as outlined by the PKCS#11 v2 spec.
Diffstat (limited to 'p11-kit/modules.c')
| -rw-r--r-- | p11-kit/modules.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/p11-kit/modules.c b/p11-kit/modules.c index 2988f31..bddc823 100644 --- a/p11-kit/modules.c +++ b/p11-kit/modules.c @@ -1384,7 +1384,7 @@ cleanup: typedef struct { p11_virtual virt; Module *mod; - bool initialized; + pid_t initialized; p11_dict *sessions; } Managed; @@ -1394,12 +1394,14 @@ managed_C_Initialize (CK_X_FUNCTION_LIST *self, { Managed *managed = ((Managed *)self); p11_dict *sessions; + pid_t pid; CK_RV rv; p11_debug ("in"); p11_lock (); - if (managed->initialized) { + pid = getpid (); + if (managed->initialized == pid) { rv = CKR_CRYPTOKI_ALREADY_INITIALIZED; } else { @@ -1412,7 +1414,7 @@ managed_C_Initialize (CK_X_FUNCTION_LIST *self, rv = initialize_module_inlock_reentrant (managed->mod); if (rv == CKR_OK) { managed->sessions = sessions; - managed->initialized = true; + managed->initialized = pid; } else { p11_dict_free (sessions); } @@ -1513,13 +1515,15 @@ managed_C_Finalize (CK_X_FUNCTION_LIST *self, { Managed *managed = ((Managed *)self); CK_SESSION_HANDLE *sessions; + pid_t pid; int count; CK_RV rv; p11_debug ("in"); p11_lock (); - if (!managed->initialized) { + pid = getpid (); + if (managed->initialized != pid) { rv = CKR_CRYPTOKI_NOT_INITIALIZED; } else { @@ -1538,7 +1542,7 @@ managed_C_Finalize (CK_X_FUNCTION_LIST *self, rv = finalize_module_inlock_reentrant (managed->mod); if (rv == CKR_OK) { - managed->initialized = false; + managed->initialized = 0; p11_dict_free (managed->sessions); managed->sessions = NULL; } |