Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitb972268

Browse files
committed
Fix race condition with BIO methods initialization in libpq with threads
The libpq code in charge of creating per-connection SSL objects wasprone to a race condition when loading the custom BIO methods needed bymy_SSL_set_fd(). As BIO methods are stored as a static variable, theinitialization of a connection could fail because it could be possibleto have one thread refer to my_bio_methods while it is being manipulatedby a second concurrent thread.This error has been introduced by8bb14cd, that has removedssl_config_mutex around the call of my_SSL_set_fd(), that itself setsthe custom BIO methods used in libpq. Like previously, the BIO methodinitialization is now protected by the existing ssl_config_mutex, itselfinitialized earlier for WIN32.While on it, document that my_bio_methods is protected byssl_config_mutex, as this can be easy to miss.Reported-by: Willi MannAuthor: Willi Mann, Michael PaquierDiscussion:https://postgr.es/m/e77abc4c-4d03-4058-a9d7-ef0035657e04@celonis.comBackpatch-through: 12
1 parentc7bd476 commitb972268

File tree

1 file changed

+51
-22
lines changed

1 file changed

+51
-22
lines changed

‎src/interfaces/libpq/fe-secure-openssl.c

Lines changed: 51 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1805,6 +1805,7 @@ PQsslAttribute(PGconn *conn, const char *attribute_name)
18051805
#defineBIO_set_data(bio,data) (bio->ptr = data)
18061806
#endif
18071807

1808+
/* protected by ssl_config_mutex */
18081809
staticBIO_METHOD*my_bio_methods;
18091810

18101811
staticint
@@ -1870,6 +1871,15 @@ my_sock_write(BIO *h, const char *buf, int size)
18701871
staticBIO_METHOD*
18711872
my_BIO_s_socket(void)
18721873
{
1874+
BIO_METHOD*res;
1875+
1876+
#ifdefENABLE_THREAD_SAFETY
1877+
if (pthread_mutex_lock(&ssl_config_mutex))
1878+
returnNULL;
1879+
#endif
1880+
1881+
res=my_bio_methods;
1882+
18731883
if (!my_bio_methods)
18741884
{
18751885
BIO_METHOD*biom= (BIO_METHOD*)BIO_s_socket();
@@ -1878,39 +1888,58 @@ my_BIO_s_socket(void)
18781888

18791889
my_bio_index=BIO_get_new_index();
18801890
if (my_bio_index==-1)
1881-
returnNULL;
1891+
gotoerr;
18821892
my_bio_index |= (BIO_TYPE_DESCRIPTOR |BIO_TYPE_SOURCE_SINK);
1883-
my_bio_methods=BIO_meth_new(my_bio_index,"libpq socket");
1884-
if (!my_bio_methods)
1885-
returnNULL;
1893+
res=BIO_meth_new(my_bio_index,"libpq socket");
1894+
if (!res)
1895+
gotoerr;
18861896

18871897
/*
18881898
* As of this writing, these functions never fail. But check anyway,
18891899
* like OpenSSL's own examples do.
18901900
*/
1891-
if (!BIO_meth_set_write(my_bio_methods,my_sock_write)||
1892-
!BIO_meth_set_read(my_bio_methods,my_sock_read)||
1893-
!BIO_meth_set_gets(my_bio_methods,BIO_meth_get_gets(biom))||
1894-
!BIO_meth_set_puts(my_bio_methods,BIO_meth_get_puts(biom))||
1895-
!BIO_meth_set_ctrl(my_bio_methods,BIO_meth_get_ctrl(biom))||
1896-
!BIO_meth_set_create(my_bio_methods,BIO_meth_get_create(biom))||
1897-
!BIO_meth_set_destroy(my_bio_methods,BIO_meth_get_destroy(biom))||
1898-
!BIO_meth_set_callback_ctrl(my_bio_methods,BIO_meth_get_callback_ctrl(biom)))
1901+
if (!BIO_meth_set_write(res,my_sock_write)||
1902+
!BIO_meth_set_read(res,my_sock_read)||
1903+
!BIO_meth_set_gets(res,BIO_meth_get_gets(biom))||
1904+
!BIO_meth_set_puts(res,BIO_meth_get_puts(biom))||
1905+
!BIO_meth_set_ctrl(res,BIO_meth_get_ctrl(biom))||
1906+
!BIO_meth_set_create(res,BIO_meth_get_create(biom))||
1907+
!BIO_meth_set_destroy(res,BIO_meth_get_destroy(biom))||
1908+
!BIO_meth_set_callback_ctrl(res,BIO_meth_get_callback_ctrl(biom)))
18991909
{
1900-
BIO_meth_free(my_bio_methods);
1901-
my_bio_methods=NULL;
1902-
returnNULL;
1910+
gotoerr;
19031911
}
19041912
#else
1905-
my_bio_methods=malloc(sizeof(BIO_METHOD));
1906-
if (!my_bio_methods)
1907-
returnNULL;
1908-
memcpy(my_bio_methods,biom,sizeof(BIO_METHOD));
1909-
my_bio_methods->bread=my_sock_read;
1910-
my_bio_methods->bwrite=my_sock_write;
1913+
res=malloc(sizeof(BIO_METHOD));
1914+
if (!res)
1915+
gotoerr;
1916+
memcpy(res,biom,sizeof(BIO_METHOD));
1917+
res->bread=my_sock_read;
1918+
res->bwrite=my_sock_write;
19111919
#endif
19121920
}
1913-
returnmy_bio_methods;
1921+
1922+
my_bio_methods=res;
1923+
1924+
#ifdefENABLE_THREAD_SAFETY
1925+
pthread_mutex_unlock(&ssl_config_mutex);
1926+
#endif
1927+
1928+
returnres;
1929+
1930+
err:
1931+
#ifdefHAVE_BIO_METH_NEW
1932+
if (res)
1933+
BIO_meth_free(res);
1934+
#else
1935+
if (res)
1936+
free(res);
1937+
#endif
1938+
1939+
#ifdefENABLE_THREAD_SAFETY
1940+
pthread_mutex_unlock(&ssl_config_mutex);
1941+
#endif
1942+
returnNULL;
19141943
}
19151944

19161945
/* This should exactly match OpenSSL's SSL_set_fd except for using my BIO */

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp