From 7a5f58b2cf0d7b2fa0451603a88c3976c657dae9 Mon Sep 17 00:00:00 2001 From: Hugo Landau Date: Thu, 24 Aug 2023 11:28:17 +0100 Subject: [PATCH] QUIC APL: Fix stream backpressure conditions to use non-I/O errors Reviewed-by: Matt Caswell Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/21811) --- crypto/err/openssl.txt | 2 +- include/openssl/sslerr.h | 2 +- ssl/quic/quic_impl.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt index b725032254e1c..3eeaa6d5d5799 100644 --- a/crypto/err/openssl.txt +++ b/crypto/err/openssl.txt @@ -1563,7 +1563,7 @@ SSL_R_SSL_SESSION_ID_HAS_BAD_LENGTH:303:ssl session id has bad length SSL_R_SSL_SESSION_ID_TOO_LONG:408:ssl session id too long SSL_R_SSL_SESSION_VERSION_MISMATCH:210:ssl session version mismatch SSL_R_STILL_IN_INIT:121:still in init -SSL_R_STREAM_COUNT_LIMITED:395:stream count limited +SSL_R_STREAM_COUNT_LIMITED:411:stream count limited SSL_R_STREAM_FINISHED:365:stream finished SSL_R_STREAM_RECV_ONLY:366:stream recv only SSL_R_STREAM_RESET:375:stream reset diff --git a/include/openssl/sslerr.h b/include/openssl/sslerr.h index 0a4079b5c8093..e1eb9a5692c25 100644 --- a/include/openssl/sslerr.h +++ b/include/openssl/sslerr.h @@ -290,7 +290,7 @@ # define SSL_R_SSL_SESSION_ID_TOO_LONG 408 # define SSL_R_SSL_SESSION_VERSION_MISMATCH 210 # define SSL_R_STILL_IN_INIT 121 -# define SSL_R_STREAM_COUNT_LIMITED 395 +# define SSL_R_STREAM_COUNT_LIMITED 411 # define SSL_R_STREAM_FINISHED 365 # define SSL_R_STREAM_RECV_ONLY 366 # define SSL_R_STREAM_RESET 375 diff --git a/ssl/quic/quic_impl.c b/ssl/quic/quic_impl.c index 5073bb1e6fade..71bd5e865b525 100644 --- a/ssl/quic/quic_impl.c +++ b/ssl/quic/quic_impl.c @@ -1764,7 +1764,7 @@ static SSL *quic_conn_stream_new(QCTX *ctx, uint64_t flags, int need_lock) * opened. */ if (no_blocking || !qc_blocking_mode(qc)) { - QUIC_RAISE_NON_NORMAL_ERROR(ctx, SSL_R_STREAM_COUNT_LIMITED, NULL); + QUIC_RAISE_NON_IO_ERROR(ctx, SSL_R_STREAM_COUNT_LIMITED, NULL); goto err; } @@ -1774,10 +1774,10 @@ static SSL *quic_conn_stream_new(QCTX *ctx, uint64_t flags, int need_lock) /* Blocking mode - wait until we can get a stream. */ ret = block_until_pred(ctx->qc, quic_new_stream_wait, &args, 0); if (!quic_mutation_allowed(qc, /*req_active=*/1)) { - QUIC_RAISE_NON_NORMAL_ERROR(ctx, SSL_R_PROTOCOL_IS_SHUTDOWN, NULL); + QUIC_RAISE_NON_IO_ERROR(ctx, SSL_R_PROTOCOL_IS_SHUTDOWN, NULL); goto err; /* Shutdown before completion */ } else if (ret <= 0) { - QUIC_RAISE_NON_NORMAL_ERROR(ctx, ERR_R_INTERNAL_ERROR, NULL); + QUIC_RAISE_NON_IO_ERROR(ctx, ERR_R_INTERNAL_ERROR, NULL); goto err; /* Non-protocol error */ } }