From nobody Sat May 28 03:20:58 2022 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 173911B3D263; Sat, 28 May 2022 03:20:59 +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 4L96Q306gSz4ryr; Sat, 28 May 2022 03:20:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653708059; 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=RudKSgpk4+73uy0p3mF2OJm6K6QRMYKujuTZmZeXyko=; b=rSYp3dTIUmRvnl3s4MrsMqOw41B0nOclb95EwV97RHVipa0jyGdrN1SQAs/NGP20bp3rHF TzPI9g0hzUROrskf4cheFIE7UnH2v7MlJNoiE944ynYtJjLXFWVGYMhId0ZgtFx9yIHwnr ALbWx1Nn9HkZhklfZXGKTPgiEA8TrHxFCj40fjvHA3718BkaLUqaqTgaCYhk5io5TqsBaI H8cTvrpHT5VdNzvBuUoQkuow4TNvTx4I5DDyYBCC12fyD9sBDNT6QJLnpZTL6Ms8Bodwfk 84UcxLdtqcNnO6LJ2uJfhV6wfuSE6A92Nyyv9DGm1G30HHV1Yfforf1UdymGBQ== 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 D451C2F0A2; Sat, 28 May 2022 03:20:58 +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 24S3Kwsk082429; Sat, 28 May 2022 03:20:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24S3KwGl082428; Sat, 28 May 2022 03:20:58 GMT (envelope-from git) Date: Sat, 28 May 2022 03:20:58 GMT Message-Id: <202205280320.24S3KwGl082428@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 79669b07b08b - stable/13 - uipc_socket.c: Modify MSG_TLSAPPDATA to only do Alert Records 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: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 79669b07b08bca80203f35495d06783da5b799c7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653708059; 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=RudKSgpk4+73uy0p3mF2OJm6K6QRMYKujuTZmZeXyko=; b=or6pL/KPLKEkRvzdKDGIbIbtbpBpOLjTIjwPxTEvozCJ5ywsVmzCBVtgQU2uFVZ062Fgo2 ldXWQO3ItCr35sYlg8d7tc0+W3/UAQyYBqIcFWxeH563HE+igbUyM7GWuWOalmRGFpRhpG XBSImDANPdYKWKuJC1C2rpfbO3maIEKJrwu0LuDoRFywoXtsW7pDvHgqVbjKdFhkoZN65f tjkJZ2YNyDxokJ0iPiWjv1crl4i6miWhVyJ+6mn489/oZmCVbhbHvS73/DBCCm1owIrqqm 0tYVJFxCSaQYlqq8miEK+E4B4IaFZqEDA0QnRrPiHy4FOAHQqrNBDt9bx3MiWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653708059; a=rsa-sha256; cv=none; b=RIT5yVWIsQNSec0fSe0kzo7rom1kDUw5HXPfu/oUyUrdrxpYvvH+1npuKF5zRJYIKabfhO PZdXZy+llfCeiOp6YaoyNtVb+4Vtjcjwl41VvjS30JRtezzq5tfB0Ww+LgKKZq/ffTEkIA RhyMswKpkaXNAfdOnrt9obAlZnb9t5oqHTZk0ATLXbHhXpzq6fV4OTGM6MUD2iMieas3RZ k5nxEejOYwuRhsUtXZfRnE3TJz3Pzh30Xr6Fr7ok1AXvcvYfTinW9H1tpwra7/ft+VRsXr UAWKqF+fkZGCcKM4JFao827G/ZkWNlxin13qi2nGZRwJBIYfy5p8XJfKCmKVXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=79669b07b08bca80203f35495d06783da5b799c7 commit 79669b07b08bca80203f35495d06783da5b799c7 Author: Rick Macklem AuthorDate: 2022-05-14 19:56:50 +0000 Commit: Rick Macklem CommitDate: 2022-05-28 03:19:48 +0000 uipc_socket.c: Modify MSG_TLSAPPDATA to only do Alert Records Without this patch, the MSG_TLSAPPDATA flag would cause soreceive_generic() to return ENXIO for any non-application data record in a TLS receive stream. This works ok for TLS1.2, since Alert records appear to be the only non-application data records received. However, for TLS1.3, there can be post-handshake handshake records, such as NewSessionKey sent to the client from the server. These handshake records cannot be handled by the upcall which does an SSL_read() with length == 0. It appears that the client can simply throw away these NewSessionKey records, but to do so, it needs to receive them within the kernel. This patch modifies the semantics of MSG_TLSAPPDATA slightly, so that it only applies to Alert records and not Handshake records. It is needed to allow the krpc to work with KTLS1.3. (cherry picked from commit 373511338d954895752e957f3028a178587c8c84) --- sys/kern/uipc_socket.c | 8 ++++---- sys/sys/ktls.h | 2 ++ sys/sys/socket.h | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index bdd7756916d9..bbcd5dd30320 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -2065,8 +2065,8 @@ dontblock: struct tls_get_record tgr; /* - * For MSG_TLSAPPDATA, check for a non-application data - * record. If found, return ENXIO without removing + * For MSG_TLSAPPDATA, check for an alert record. + * If found, return ENXIO without removing * it from the receive queue. This allows a subsequent * call without MSG_TLSAPPDATA to receive it. * Note that, for TLS, there should only be a single @@ -2077,8 +2077,8 @@ dontblock: if (cmsg->cmsg_type == TLS_GET_RECORD && cmsg->cmsg_len == CMSG_LEN(sizeof(tgr))) { memcpy(&tgr, CMSG_DATA(cmsg), sizeof(tgr)); - /* This will need to change for TLS 1.3. */ - if (tgr.tls_type != TLS_RLTYPE_APP) { + if (__predict_false(tgr.tls_type == + TLS_RLTYPE_ALERT)) { SOCKBUF_UNLOCK(&so->so_rcv); error = ENXIO; goto release; diff --git a/sys/sys/ktls.h b/sys/sys/ktls.h index 0e16fd5d9d1e..9fc01de5978c 100644 --- a/sys/sys/ktls.h +++ b/sys/sys/ktls.h @@ -50,6 +50,8 @@ struct tls_record_layer { #define TLS_CBC_IMPLICIT_IV_LEN 16 /* Type values for the record layer */ +#define TLS_RLTYPE_ALERT 21 +#define TLS_RLTYPE_HANDSHAKE 22 #define TLS_RLTYPE_APP 23 /* diff --git a/sys/sys/socket.h b/sys/sys/socket.h index 2cb76f9c6d63..de7a874b3079 100644 --- a/sys/sys/socket.h +++ b/sys/sys/socket.h @@ -470,7 +470,7 @@ struct msghdr { #endif #ifdef _KERNEL #define MSG_MORETOCOME 0x00100000 /* additional data pending */ -#define MSG_TLSAPPDATA 0x00200000 /* only soreceive() app. data (TLS) */ +#define MSG_TLSAPPDATA 0x00200000 /* do not soreceive() alert rec. (TLS) */ #endif /*