From nobody Sat May 14 00:10:00 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 73C261AE32AD; Sat, 14 May 2022 00:10:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L0Qr86Gl0z4SbB; Sat, 14 May 2022 00:10:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652487001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2LQ8jvjBERUSRilER5KeAB2EECyzxzSDkdZ1G5j2nrM=; b=j8O+cIk6Mo7NTSX/9EzgLUU+K5JNKSt87PSvNJiAnlyGPgggYau2HhxX09UNR7uTw9I6rV InK9vVQb/d8jjVDcU1wAM0vLKqIr88DbdJ9+ICh3qkxj4v6+Rer9t/nSS64IODoh8Lgvca /LABMmF+gIQJwROg+O+XvZNZqsBhEnApyQiM2DAGdNLB9uunUlc8ME2L/F7QJzJzIEXeJ1 fMIamG3I3nfndJuLiRleMXN6tDMBaG0jdQbSGd6QlhZhT8R2dCkwM5V0K6PxowczzsHkb3 6hGZsgBeDNssgjNzeuRnqOgyiPUhxBOOUpeZXWlI176vSQUz5VwrRRicwTy2pA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A3CC14B34; Sat, 14 May 2022 00:10:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24E0A0sm074341; Sat, 14 May 2022 00:10:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24E0A0jX074331; Sat, 14 May 2022 00:10:00 GMT (envelope-from git) Date: Sat, 14 May 2022 00:10:00 GMT Message-Id: <202205140010.24E0A0jX074331@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: a8333d4c62cb - stable/13 - OpenSSL: KTLS: Add using_ktls helper variable in ssl3_get_record(). List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a8333d4c62cbf69f7510208749703a0d9370b138 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652487001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2LQ8jvjBERUSRilER5KeAB2EECyzxzSDkdZ1G5j2nrM=; b=fgcdHQdXQxcibWkq8b7GSyGodHrbNC2npDSDthG5/xyoUWFzpnUQWPRrdG1baTuXtxbYq3 BEMthxv5AD8AZs0I3T8011D/NAAePxzph6c1XpTmvzTiJWPbeLjyF9Tl22fXLuPUerxIdg bC2ZnELrwEqMUql2K4juWy4Fwauez6nUkfhphyZVLC27pmCN49N9EkMkNntY9ToSWq7ExS rO+sagD5jdNwUgZ/sdQCp0z0LpWdHLFlUO2JPBy6vhPXbThQMq/DWo8SMCCldysD1hHdOc kbWwnK3cHde/nHB9yzpq9suyF8xERg101ShHmHT2AroxRDigIHcoQgg4BPzQzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652487001; a=rsa-sha256; cv=none; b=hZRFWt4fEwBaKXAOeiLxbvNVDaYmR6ls4tDlHGv3r9PLrzeXaieQlWGIP6WybKAxltzWc+ LIyqaDFHr86cR2muZC/RS1cF4bTVkIafISXB8vWocRvk6bTKC9G/9K0ProW41VcpUoVVc4 x4SMi9V9R51PuHfM4mSN04JnzmoZC5ycBpR9Vw05OEQGQPbRkoekdHsAyR6C/IaBq/ZqZr IZH8mCJRuj9Ur0IeXjxmgD6pqYp4JtCRRUMZ9eGtC1SL6d7kh/pcDwU8uYLcMkAxUblWlY UoxSyEdIZ8i65HvXfy/tIXovgdrr1JputWV7EjFSnJ9NXBflRHPoWdiCoPTnfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a8333d4c62cbf69f7510208749703a0d9370b138 commit a8333d4c62cbf69f7510208749703a0d9370b138 Author: John Baldwin AuthorDate: 2022-05-04 20:08:17 +0000 Commit: John Baldwin CommitDate: 2022-05-13 23:51:20 +0000 OpenSSL: KTLS: Add using_ktls helper variable in ssl3_get_record(). When KTLS receive is enabled, pending data may still be present due to read ahead. This data must still be processed the same as records received without KTLS. To ease readability (especially in consideration of additional checks which will be added for TLS 1.3), add a helper variable 'using_ktls' that is true when the KTLS receive path is being used to receive a record. Approved by: jkim Obtained from: OpenSSL commit 031132c297e54cbc20404a0bf8de6ed863196399 MFC after: 1 week Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D34974 (cherry picked from commit 4f1f9c550227667efaad65e7f2a0034355d94dc8) --- crypto/openssl/ssl/record/ssl3_record.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/crypto/openssl/ssl/record/ssl3_record.c b/crypto/openssl/ssl/record/ssl3_record.c index 4fd22019ee7b..5fa481de9dbe 100644 --- a/crypto/openssl/ssl/record/ssl3_record.c +++ b/crypto/openssl/ssl/record/ssl3_record.c @@ -186,16 +186,21 @@ int ssl3_get_record(SSL *s) size_t num_recs = 0, max_recs, j; PACKET pkt, sslv2pkt; size_t first_rec_len; - int is_ktls_left; + int using_ktls; rr = RECORD_LAYER_get_rrec(&s->rlayer); rbuf = RECORD_LAYER_get_rbuf(&s->rlayer); - is_ktls_left = (SSL3_BUFFER_get_left(rbuf) > 0); max_recs = s->max_pipelines; if (max_recs == 0) max_recs = 1; sess = s->session; + /* + * KTLS reads full records. If there is any data left, + * then it is from before enabling ktls. + */ + using_ktls = BIO_get_ktls_recv(s->rbio) && SSL3_BUFFER_get_left(rbuf) == 0; + do { thisrr = &rr[num_recs]; @@ -413,7 +418,7 @@ int ssl3_get_record(SSL *s) #endif /* KTLS may use all of the buffer */ - if (BIO_get_ktls_recv(s->rbio) && !is_ktls_left) + if (using_ktls) len = SSL3_BUFFER_get_left(rbuf); if (thisrr->length > len) { @@ -522,11 +527,7 @@ int ssl3_get_record(SSL *s) return 1; } - /* - * KTLS reads full records. If there is any data left, - * then it is from before enabling ktls - */ - if (BIO_get_ktls_recv(s->rbio) && !is_ktls_left) + if (using_ktls) goto skip_decryption; /* @@ -787,8 +788,7 @@ int ssl3_get_record(SSL *s) * Therefore we have to rely on KTLS to check the plaintext length * limit in the kernel. */ - if (thisrr->length > SSL3_RT_MAX_PLAIN_LENGTH - && (!BIO_get_ktls_recv(s->rbio) || is_ktls_left)) { + if (thisrr->length > SSL3_RT_MAX_PLAIN_LENGTH && !using_ktls) { SSLfatal(s, SSL_AD_RECORD_OVERFLOW, SSL_F_SSL3_GET_RECORD, SSL_R_DATA_LENGTH_TOO_LONG); return -1;