[openssl] master update

matthias.st.pierre at ncp-e.com matthias.st.pierre at ncp-e.com
Thu May 7 17:19:26 UTC 2020

The branch master has been updated
       via  73d6b4efe6835a6c97ce61df6bf339b0903e5b7a (commit)
      from  90fc2c26df23811be080093772b2161850385863 (commit)

- Log -----------------------------------------------------------------
commit 73d6b4efe6835a6c97ce61df6bf339b0903e5b7a
Author: Dr. Matthias St. Pierre <matthias.st.pierre at ncp-e.com>
Date:   Wed May 6 17:24:13 2020 +0200

    Fix use-after-free in BIO_C_SET_SSL callback
    Since the BIO_SSL structure was renewed by `ssl_free(b)/ssl_new(b)`,
    the `bs` pointer needs to be updated before assigning to `bs->ssl`.
    Thanks to @suishixingkong for reporting the issue and providing a fix.
    Closes #10539
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    (Merged from https://github.com/openssl/openssl/pull/11746)


Summary of changes:
 ssl/bio_ssl.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ssl/bio_ssl.c b/ssl/bio_ssl.c
index b44ec3e5e1..ca364fd14f 100644
--- a/ssl/bio_ssl.c
+++ b/ssl/bio_ssl.c
@@ -284,6 +284,7 @@ static long ssl_ctrl(BIO *b, int cmd, long num, void *ptr)
             if (!ssl_new(b))
                 return 0;
+            bs = BIO_get_data(b);
         BIO_set_shutdown(b, num);
         ssl = (SSL *)ptr;

More information about the openssl-commits mailing list