Attachment 93991 Details for Bug 74919 – proxy: Fix cases where modules are unloaded while in use

[patch] proxy: Fix cases where modules are unloaded while in use

proxy-Fix-cases-where-modules-are-unloaded-while-i.patch (text/plain), 3.43 KB, created by Stef Walter on 2014-02-13 08:57:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stef Walter

Created: 2014-02-13 08:57:32 UTC

Size: 3.43 KB

patch

obsolete

>From 82c33a4f0824cddb80225ef615ce108833efd129 Mon Sep 17 00:00:00 2001
>From: Stef Walter <stef@thewalter.net>
>Date: Thu, 13 Feb 2014 09:52:34 +0100
>Subject: [PATCH] proxy: Fix cases where modules are unloaded while in use
>
>The proxy module would unload the PKCS#11 modules it was proxying
>when C_Finalize() was called. However if a caller in another thread
>was inside of a PKCS#11 function at the time, this would cause
>a crash.
>
>Change things around so that underlying modules are finalized during
>the proxy C_Finalize() but not released/unloaded until the proxy
>module itself is unloaded.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=74919
>---
> p11-kit/proxy.c | 53 +++++++++++++++++++++++++++++++----------------------
> 1 file changed, 31 insertions(+), 22 deletions(-)
>
>diff --git a/p11-kit/proxy.c b/p11-kit/proxy.c
>index 36a43a1..436654c 100644
>--- a/p11-kit/proxy.c
>+++ b/p11-kit/proxy.c
>@@ -81,7 +81,7 @@ typedef struct {
> 	Mapping *mappings;
> 	unsigned int n_mappings;
> 	p11_dict *sessions;
>-	CK_FUNCTION_LIST **modules;
>+	p11_array *inited;
> } Proxy;
> 
> typedef struct _State {
>@@ -92,6 +92,7 @@ typedef struct _State {
> 	Proxy *px;
> } State;
> 
>+static CK_FUNCTION_LIST **all_modules = NULL;
> static State *all_instances = NULL;
> static State global = { { { { -1, -1 }, NULL, }, }, NULL, NULL, FIRST_HANDLE, NULL };
> 
>@@ -188,7 +189,7 @@ static void
> proxy_free (Proxy *py)
> {
> 	if (py) {
>-		p11_kit_modules_finalize_and_release (py->modules);
>+		p11_array_free (py->inited);
> 		p11_dict_free (py->sessions);
> 		free (py->mappings);
> 		free (py);
>@@ -276,28 +277,19 @@ proxy_create (Proxy **res)
> 	py = calloc (1, sizeof (Proxy));
> 	return_val_if_fail (py != NULL, CKR_HOST_MEMORY);
> 
>-	p11_lock ();
>-
>-		/* WARNING: Reentrancy can occur here */
>-		rv = p11_modules_load_inlock_reentrant (0, &py->modules);
>+	py->inited = p11_array_new ((p11_destroyer)p11_kit_module_finalize);
>+	return_val_if_fail (py->inited != NULL, CKR_HOST_MEMORY);
> 
>-	p11_unlock ();
>-
>-	if (rv != CKR_OK) {
>-		proxy_free (py);
>-		free (py);
>-		return rv;
>-	}
>+	for (f = all_modules; *f; ++f) {
>+		funcs = *f;
> 
>-	rv = p11_kit_modules_initialize (py->modules, (p11_destroyer)p11_kit_module_release);
>-	if (rv != CKR_OK) {
>-		p11_kit_modules_release (py->modules);
>-		free (py);
>-		return rv;
>-	}
>+		rv = p11_kit_module_initialize (funcs);
>+		if (rv != CKR_OK)
>+			break;
> 
>-	for (f = py->modules; *f; ++f) {
>-		funcs = *f;
>+		/* Make note of everything we've initialized */
>+		if (!p11_array_push (py->inited, funcs))
>+			return_val_if_reached (CKR_HOST_MEMORY);
> 
> 		assert (funcs != NULL);
> 		slots = NULL;
>@@ -2366,13 +2358,25 @@ CK_RV
> C_GetFunctionList (CK_FUNCTION_LIST_PTR_PTR list)
> {
> 	CK_FUNCTION_LIST_PTR module = NULL;
>+	CK_FUNCTION_LIST **loaded;
> 	State *state;
> 	CK_RV rv = CKR_OK;
> 
> 	p11_library_init_once ();
> 	p11_lock ();
> 
>-	if (p11_virtual_can_wrap ()) {
>+	if (all_modules == NULL) {
>+		/* WARNING: Reentrancy can occur here */
>+		rv = p11_modules_load_inlock_reentrant (0, &loaded);
>+		if (rv == CKR_OK) {
>+			if (all_modules == NULL)
>+				all_modules = loaded;
>+			else
>+				p11_modules_release_inlock_reentrant (loaded);
>+		}
>+	}
>+
>+	if (rv == CKR_OK && p11_virtual_can_wrap ()) {
> 		state = calloc (1, sizeof (State));
> 		if (!state) {
> 			rv = CKR_HOST_MEMORY;
>@@ -2419,6 +2423,11 @@ p11_proxy_module_cleanup (void)
> 		next = state->next;
> 		p11_virtual_unwrap (state->wrapped);
> 	}
>+
>+	if (all_modules) {
>+		p11_kit_modules_release (all_modules);
>+		all_modules = NULL;
>+	}
> }
> 
> bool
>-- 
>1.8.5.3

Actions: View | Splinter Review

Attachments on bug 74919: 93991 | 93992

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.