From nobody Tue Nov 23 23:12:54 2021 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 224BB18A1C01; Tue, 23 Nov 2021 23:12: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 4HzKgC500Bz3vY9; Tue, 23 Nov 2021 23:12:55 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 5C62A1F148; Tue, 23 Nov 2021 23:12:54 +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 1ANNCs1a037687; Tue, 23 Nov 2021 23:12:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ANNCsVi037686; Tue, 23 Nov 2021 23:12:54 GMT (envelope-from git) Date: Tue, 23 Nov 2021 23:12:54 GMT Message-Id: <202111232312.1ANNCsVi037686@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: 0053fedc1b47 - stable/13 - ktls: Reject attempts to enable AES-CBC with TLS 1.3. 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: 0053fedc1b4790f2e094c326adef95302c105f8b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637709176; 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=aliLs6Qr9UhH9kKXABszquHcTcXicH00mrlmCDxREoQ=; b=Gq9nolw38xXcTmcy+Vfph+VRpJUbDKfvNAtteVxzf9UqH/72d2jpC0tFMnHRcqMMN1TwL2 Gx3ZzhcgVRYNvn0mqyECQTPND5gi/ik+E2x2pa7kDt/YhSAbGxN9I9+hsqeWibam60A8Sw qoFMEsJ+gqmRqz/CQdCdsUNwHdkI62IdDyDTwokzR+6fEktCi0IhpsOwWW19vkA+lyDpSN WzYDYUoag7reLZL+E6EwFRVIEpQ+eMHMaLXha98Ze5wh2FccDueKrSpj7C1oMZE5FDD5Ti 9C/vrK7rX1KlY16yEw6ycgOq5/iA7y4ktdWPzj9bQa8HU/6ENLUwcR3OxInN6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637709176; a=rsa-sha256; cv=none; b=da2aAKbDZXtRVmwvkwCebP75dQ87tfQQIszs4sUFUAo6FeFXdfMhiJLC15Jw8DI4aQFw5V i7Dq4WKrL1dCQ6hKmweYVLRlDCFEvy4+6wBG6u2wQSNqW15vkj5iyzVh4F3KGcqNMgVJiA Wh8Dho2vVkLBzpsHMIu+L1aNYnQlqksMWaHw1WHVmzTiQhsAt0S0fxX0rhFw2BiSJEvQRr e9AR2s9AXuVn0pycIUzKd1XhoW2I0HO/ftqZZHi0RKF9xqHFHHZQx76ddVNhf/Y3jTXuoy SyXqd9R6OvV0vKWsCIiaTQAWtZn1Ap3B9dtYjEl32VisLEK3oyhuMxhoSn+mdA== 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=0053fedc1b4790f2e094c326adef95302c105f8b commit 0053fedc1b4790f2e094c326adef95302c105f8b Author: John Baldwin AuthorDate: 2021-10-13 19:12:58 +0000 Commit: John Baldwin CommitDate: 2021-11-23 23:11:44 +0000 ktls: Reject attempts to enable AES-CBC with TLS 1.3. AES-CBC cipher suites are not supported in TLS 1.3. Reported by: syzbot+ab501c50033ec01d53c6@syzkaller.appspotmail.com Reviewed by: tuexen, markj Differential Revision: https://reviews.freebsd.org/D32404 (cherry picked from commit a63752cce6462d08bbec08cad931d70dec2f5b4c) --- sys/kern/uipc_ktls.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/kern/uipc_ktls.c b/sys/kern/uipc_ktls.c index 0cb5343b6a2a..73915600779c 100644 --- a/sys/kern/uipc_ktls.c +++ b/sys/kern/uipc_ktls.c @@ -522,6 +522,10 @@ ktls_create_session(struct socket *so, struct tls_enable *en, } if (en->auth_key_len == 0) return (EINVAL); + if (en->tls_vminor != TLS_MINOR_VER_ZERO && + en->tls_vminor != TLS_MINOR_VER_ONE && + en->tls_vminor != TLS_MINOR_VER_TWO) + return (EINVAL); break; case CRYPTO_CHACHA20_POLY1305: if (en->auth_algorithm != 0 || en->auth_key_len != 0)