From nobody Wed Oct 25 00:41:48 2023 X-Original-To: dev-commits-src-branches@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 4SFVVh3rDTz4xl4Z; Wed, 25 Oct 2023 00:41:48 +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 4SFVVh3GK3z3SMG; Wed, 25 Oct 2023 00:41:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698194508; 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=05lVDdqBx37SLZANQwCSGAcnYYl/HGWXeJI4EWtbr8g=; b=Qk9n1LLUN0YihP48+6Lwjmzv1kETK3vOr8OKmtx9HCQ6q3qSHPxP0aiNrCJJrq/YSWSjog N2FJQpBreiVI82ILLoEzr4cfblSZMo71lh1dIxR/ADXARl3SxvsOMaWZZjm+tSdzfmoOOi 5TyHkHX0VcgddtM4BD/Kj5Gu1lmpCyt1RQNiCWrsHRTkNdQnxGGf0x/dS15iqI3NOoxiJf w457HL4QTUGInctk1raApzih1nuS2FaLwqNwo7mymQYYFi7GOljtZR2d0Dvjo4H6EX9LLa uY7N+XpFjt3rYm8HT/RsVwkBIyxkXKk8uZXBXy9eCOQWYAUe9NypQSjNrOWIqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698194508; a=rsa-sha256; cv=none; b=qVCUjOo3w+zb9kbU1dU2aPmezJdiNHDAVlxnWJYil3DV/Cpwm8kWm6lLMAw0MR7iASVGC0 7FTGUbCg0ztS0qVE0dlKKJ2MDlxOdXaXsmGhP9ETo0YzuVo0XLkfKwv5mSqLxgZ8dZAjDv r9tWEHGGN6l49ZqZET1Wx+tf976zf2htHEaB+GdB85j7i1fh1DJnB+gGqOIDzMwc1jYNZC 5WPBV+SkzRHoLXqkkMrHfvA/RJKvuw5+oJnC+9ucV6CVKA7f/v3j5XDNVQjupa7Hg8CH/H nnVjG2i+DmYqyDFCO/Vkzd8mJRJYpyZ9E6BkBb5YAucc73C1mhZ6mTI+EJb6Eg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698194508; 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=05lVDdqBx37SLZANQwCSGAcnYYl/HGWXeJI4EWtbr8g=; b=d9oqe2eprDQbJE63U9u+y6ZXspQ2cKdRLj/VnZZ8rwpJkk9nHLhxJplkV+B4AZipp8Q2MT FIZLvT7HC7n/rAiL+qJ1xQyewCj4a9VgHDOO/WsH6GLFCQIb79SJLQYL0bE1HaSVIcmfLr rm4ONmo+xbiZL6HoZFsMdV5BLpWfC9GdzpKpnYFWSc0oPsN7g1QKarUYyyD29uitYmj+Vl V/lFDjUhXjIZVSxeJBb/RDo4XFbEX2tfnFolin3Xp9DDX+sc2U/Z2a8uMonJmOn0ROaK8k 59zagrSeWlG5FfOztgq7cy518NeIO5kwQfgTpXB+wAPHP8wxdw3RaGvTqBoXXA== 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 4SFVVh2Lzszkpp; Wed, 25 Oct 2023 00:41:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39P0fmjN005821; Wed, 25 Oct 2023 00:41:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39P0fm08005818; Wed, 25 Oct 2023 00:41:48 GMT (envelope-from git) Date: Wed, 25 Oct 2023 00:41:48 GMT Message-Id: <202310250041.39P0fm08005818@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: 3bfed5642ddf - releng/14.0 - KTLS: Add using_ktls helper variable in ssl3_get_record(). List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 3bfed5642ddfe1c4b966d6a276fd15c645e94b32 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3bfed5642ddfe1c4b966d6a276fd15c645e94b32 commit 3bfed5642ddfe1c4b966d6a276fd15c645e94b32 Author: John Baldwin AuthorDate: 2022-03-08 00:55:18 +0000 Commit: John Baldwin CommitDate: 2023-10-24 19:28:49 +0000 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. Obtained from: OpenSSL commit 031132c297e54cbc20404a0bf8de6ed863196399 (cherry picked from commit 0fc28f22d5b6a75d8a0449262a05cefe1040f982) (cherry picked from commit 65e292cdf15539472ffe3ecf561951d08fa2a76d) Approved by: re (gjb) --- 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 3c0b1323a459..57915e1bd6e0 100644 --- a/crypto/openssl/ssl/record/ssl3_record.c +++ b/crypto/openssl/ssl/record/ssl3_record.c @@ -185,18 +185,23 @@ int ssl3_get_record(SSL *s) int imac_size; size_t num_recs = 0, max_recs, j; PACKET pkt, sslv2pkt; - int is_ktls_left; + int using_ktls; SSL_MAC_BUF *macbufs = NULL; int ret = -1; 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]; @@ -409,7 +414,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) { @@ -518,11 +523,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; if (s->read_hash != NULL) { @@ -734,8 +735,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_R_DATA_LENGTH_TOO_LONG); goto end; }