Commit 33a37a61 authored by Benjamin Kaduk's avatar Benjamin Kaduk Committed by Benjamin Kaduk
Browse files

Restore sensible "sess_accept" counter tracking 



Commit 9ef9088c switched the SSL/SSL_CTX
statistics counters to using Thread-Sanitizer-friendly primitives.
However, it erroneously converted an addition of -1
(for s->session_ctx->stats.sess_accept) to an addition of +1, since that
is the only counter API provided by the internal tsan_assist.h header
until the previous commit.  This means that for each accepted (initial)
connection, the session_ctx's counter would get doubly incremented, and the
(switched) ctx's counter would also get incremented.

Restore the counter decrement so that each accepted connection increments
exactly one counter exactly once (in net effect).

Reviewed-by: default avatarPaul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/7464)

(cherry picked from commit 2aaa0b14)
parent a649b52f

ssl/statem/extensions.c

+1 −1
Original line number Diff line number Diff line
@@ -962,7 +962,7 @@ static int final_server_name(SSL *s, unsigned int context, int sent) 
     */

    if (SSL_IS_FIRST_HANDSHAKE(s) && s->ctx != s->session_ctx) {

        tsan_counter(&s->ctx->stats.sess_accept);

        tsan_counter(&s->session_ctx->stats.sess_accept);

        tsan_decr(&s->session_ctx->stats.sess_accept);

    }



    /*