From owner-dev-commits-src-all@freebsd.org Sat Jan 9 20:27:39 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 28AC94E1EAD; Sat, 9 Jan 2021 20:27:39 +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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DCs3H0jnGz4SJk; Sat, 9 Jan 2021 20:27:39 +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 0B6FA1C186; Sat, 9 Jan 2021 20:27:39 +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 109KRcXY066622; Sat, 9 Jan 2021 20:27:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 109KRcTC066621; Sat, 9 Jan 2021 20:27:38 GMT (envelope-from git) Date: Sat, 9 Jan 2021 20:27:38 GMT Message-Id: <202101092027.109KRcTC066621@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 6685e259e319 - main - tcp: don't use KTLS socket option on listening sockets MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6685e259e31995e20fa2f9cd7e19a292fcdc6877 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jan 2021 20:27:39 -0000 The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=6685e259e31995e20fa2f9cd7e19a292fcdc6877 commit 6685e259e31995e20fa2f9cd7e19a292fcdc6877 Author: Michael Tuexen AuthorDate: 2021-01-08 07:51:39 +0000 Commit: Michael Tuexen CommitDate: 2021-01-08 07:57:11 +0000 tcp: don't use KTLS socket option on listening sockets KTLS socket options make use of socket buffers, which are not available for listening sockets. Reported by: syzbot+a8829e888a93a4a04619@syzkaller.appspotmail.com Reviewed by: jhb@ Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D27948 --- sys/kern/uipc_ktls.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sys/kern/uipc_ktls.c b/sys/kern/uipc_ktls.c index 6ea14e8aa9e2..e430afdabc23 100644 --- a/sys/kern/uipc_ktls.c +++ b/sys/kern/uipc_ktls.c @@ -1014,6 +1014,8 @@ ktls_enable_rx(struct socket *so, struct tls_enable *en) if (!ktls_offload_enable) return (ENOTSUP); + if (SOLISTENING(so)) + return (EINVAL); counter_u64_add(ktls_offload_enable_calls, 1); @@ -1079,6 +1081,8 @@ ktls_enable_tx(struct socket *so, struct tls_enable *en) if (!ktls_offload_enable) return (ENOTSUP); + if (SOLISTENING(so)) + return (EINVAL); counter_u64_add(ktls_offload_enable_calls, 1); @@ -1155,6 +1159,8 @@ ktls_get_rx_mode(struct socket *so) struct inpcb *inp; int mode; + if (SOLISTENING(so)) + return (EINVAL); inp = so->so_pcb; INP_WLOCK_ASSERT(inp); SOCKBUF_LOCK(&so->so_rcv); @@ -1174,6 +1180,8 @@ ktls_get_tx_mode(struct socket *so) struct inpcb *inp; int mode; + if (SOLISTENING(so)) + return (EINVAL); inp = so->so_pcb; INP_WLOCK_ASSERT(inp); SOCKBUF_LOCK(&so->so_snd); @@ -1196,6 +1204,8 @@ ktls_set_tx_mode(struct socket *so, int mode) struct inpcb *inp; int error; + if (SOLISTENING(so)) + return (EINVAL); switch (mode) { case TCP_TLS_MODE_SW: case TCP_TLS_MODE_IFNET: