summaryrefslogtreecommitdiff
path: root/debian/patches/fix-pkcs11-helper-hang.patch
diff options
context:
space:
mode:
authorHilko Bengen <bengen@debian.org>2019-02-19 10:37:53 +0100
committerBernhard Schmidt <berni@debian.org>2019-02-20 14:29:56 +0100
commit89368d36202104dd4bc3827ab0611b229de05b27 (patch)
tree145bedb9232588bbdbefad963bb1a0e0f971c94a /debian/patches/fix-pkcs11-helper-hang.patch
parentd391b6992cfe5223aa58e714ec6710bd63013db4 (diff)
Avoid hangs when spawhning child processes by not setting pkcs11-helper "safe fork mode" (Closes: #772812, #900805, #907452)
Diffstat (limited to 'debian/patches/fix-pkcs11-helper-hang.patch')
-rw-r--r--debian/patches/fix-pkcs11-helper-hang.patch13
1 files changed, 13 insertions, 0 deletions
diff --git a/debian/patches/fix-pkcs11-helper-hang.patch b/debian/patches/fix-pkcs11-helper-hang.patch
new file mode 100644
index 0000000..41d9be1
--- /dev/null
+++ b/debian/patches/fix-pkcs11-helper-hang.patch
@@ -0,0 +1,13 @@
+Index: openvpn/src/openvpn/pkcs11.c
+===================================================================
+--- openvpn.orig/src/openvpn/pkcs11.c
++++ openvpn/src/openvpn/pkcs11.c
+@@ -312,7 +312,7 @@ pkcs11_initialize(
+
+ pkcs11h_setLogLevel(_pkcs11_msg_openvpn2pkcs11(get_debug_level()));
+
+- if ((rv = pkcs11h_setForkMode(TRUE)) != CKR_OK)
++ if ((rv = pkcs11h_setForkMode(FALSE)) != CKR_OK)
+ {
+ msg(M_FATAL, "PKCS#11: Cannot set fork mode %ld-'%s'", rv, pkcs11h_getMessage(rv));
+ goto cleanup;