From: Matt Caswell <matt@openssl.org>
Date: Thu, 1 Dec 2022 14:16:02 +0000 (+0000)
Subject: Don't raise an error on retryable read in a BIO_s_dgram_pair()
X-Git-Tag: openssl-3.2.0-alpha1~1262
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f968ecf479ed6ab8a2b25bd1077300baf2287a7;p=thirdparty%2Fopenssl.git

Don't raise an error on retryable read in a BIO_s_dgram_pair()

This results in spurious errors appearing on the queue in normal
operation, e.g. calling SSL_tick() with a QUIC connection will succeed,
but an error will end up on the queue anyway.

Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20030)
---

diff --git a/crypto/bio/bss_dgram_pair.c b/crypto/bio/bss_dgram_pair.c
index 3685d51f55d..b80fa62e48a 100644
--- a/crypto/bio/bss_dgram_pair.c
+++ b/crypto/bio/bss_dgram_pair.c
@@ -1066,12 +1066,10 @@ static int dgram_pair_recvmmsg(BIO *bio, BIO_MSG *msg,
                                    m->local, m->peer, 1);
         if (l < 0) {
             *num_processed = i;
-            if (i > 0) {
+            if (i > 0)
                 ret = 1;
-            } else {
-                ERR_raise(ERR_LIB_BIO, -l);
+            else
                 ret = 0;
-            }
             goto out;
         }