From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 5 Mar 2020 19:26:06 +0000 (-0800)
Subject: Don't check errno if ktls_read_record() returned 0.
X-Git-Tag: openssl-3.0.0-alpha7~430
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3c1641e8e86dc86028637251421a57827243f6ca;p=thirdparty%2Fopenssl.git

Don't check errno if ktls_read_record() returned 0.

errno is only valid if ktls_read_record() fails with a negative return
value.

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12111)
---

diff --git a/ssl/record/ssl3_record.c b/ssl/record/ssl3_record.c
index 27167ba92fd..634052d342f 100644
--- a/ssl/record/ssl3_record.c
+++ b/ssl/record/ssl3_record.c
@@ -213,7 +213,7 @@ int ssl3_get_record(SSL *s)
                                num_recs == 0 ? 1 : 0, &n);
             if (rret <= 0) {
 #ifndef OPENSSL_NO_KTLS
-                if (!BIO_get_ktls_recv(s->rbio))
+                if (!BIO_get_ktls_recv(s->rbio) || rret == 0)
                     return rret;     /* error or non-blocking */
                 switch (errno) {
                 case EBADMSG: