Date: Sat, 9 Jan 2021 20:27:38 GMT From: Michael Tuexen <tuexen@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 6685e259e319 - main - tcp: don't use KTLS socket option on listening sockets Message-ID: <202101092027.109KRcTC066621@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=6685e259e31995e20fa2f9cd7e19a292fcdc6877 commit 6685e259e31995e20fa2f9cd7e19a292fcdc6877 Author: Michael Tuexen <tuexen@FreeBSD.org> AuthorDate: 2021-01-08 07:51:39 +0000 Commit: Michael Tuexen <tuexen@FreeBSD.org> 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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101092027.109KRcTC066621>