Attachment 1618713 Details for Bug 1755154 – A patch based on the upstream patch that resolves the issue

[patch] A patch based on the upstream patch that resolves the issue

fix-libpq-ssl-deadlocks.patch (text/plain), 1.42 KB, created by Matt Prahl on 2019-09-24 21:42:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matt Prahl

Created: 2019-09-24 21:42:30 UTC

Size: 1.42 KB

patch

obsolete

>diff --git a/src/interfaces/libpq/fe-secure.c b/src/interfaces/libpq/fe-secure.c
>index f0a8f4e..9c5d695 100644
>--- a/src/interfaces/libpq/fe-secure.c
>+++ b/src/interfaces/libpq/fe-secure.c
>@@ -941,9 +941,12 @@ init_ssl_system(PGconn *conn)
> 
> 		if (ssl_open_connections++ == 0)
> 		{
>-			/* These are only required for threaded libcrypto applications */
>-			CRYPTO_set_id_callback(pq_threadidcallback);
>-			CRYPTO_set_locking_callback(pq_lockingcallback);
>+			/* These are only required for threaded libcrypto applications, but
>+			 * make sure we don't stomp on them if they're already set. */
>+			if (CRYPTO_get_id_callback() == NULL)
>+				CRYPTO_set_id_callback(pq_threadidcallback);
>+			if (CRYPTO_get_locking_callback() == NULL)
>+				CRYPTO_set_locking_callback(pq_lockingcallback);
> 		}
> 	}
> #endif   /* HAVE_CRYPTO_LOCK */
>@@ -997,9 +1000,12 @@ destroy_ssl_system(void)
> 
> 	if (pq_init_crypto_lib && ssl_open_connections == 0)
> 	{
>-		/* No connections left, unregister libcrypto callbacks */
>-		CRYPTO_set_locking_callback(NULL);
>-		CRYPTO_set_id_callback(NULL);
>+		/* No connections left, unregister libcrypto callbacks, if no one
>+		 * registered different ones in the meantime. */
>+		if (CRYPTO_get_id_callback() == pq_threadidcallback)
>+			CRYPTO_set_id_callback(NULL);
>+		if (CRYPTO_get_locking_callback() == pq_lockingcallback)
>+			CRYPTO_set_locking_callback(NULL);
> 
> 		/*
> 		 * We don't free the lock array. If we get another connection in

Actions: View | Diff

Attachments on bug 1755154: 1618713 | 1629194 | 1629195