summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStef Walter <stef@thewalter.net>2013-07-16 18:53:35 +0200
committerStef Walter <stef@thewalter.net>2013-07-18 09:25:44 +0200
commit9d96f891fdf6267b72fbc60acc862dfd6d410a26 (patch)
tree6d1205df1da327a11f0eacc033a7783d1a3815ec
parent46ac3fcb39483799946c606328e1006e92763a81 (diff)
downloadp11-kit-9d96f891fdf6267b72fbc60acc862dfd6d410a26.tar.gz
p11-kit: Abort initialization if critical module fails to initialize
https://bugzilla.redhat.com/show_bug.cgi?id=985023
-rw-r--r--p11-kit/modules.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/p11-kit/modules.c b/p11-kit/modules.c
index 19ba895..46c6817 100644
--- a/p11-kit/modules.c
+++ b/p11-kit/modules.c
@@ -708,7 +708,7 @@ _p11_kit_initialize_registered_unlocked_reentrant (void)
rv = load_registered_modules_unlocked ();
if (rv == CKR_OK) {
p11_dict_iterate (gl.modules, &iter);
- while (p11_dict_next (&iter, NULL, (void **)&mod)) {
+ while (rv == CKR_OK && p11_dict_next (&iter, NULL, (void **)&mod)) {
/* Skip all modules that aren't registered */
if (mod->name == NULL || !is_module_enabled_unlocked (mod->name, mod->config))