From nobody Wed Dec 28 00:01:15 2022 X-Original-To: dev-commits-src-main@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 4NhWrq5dpXz1LnRj; Wed, 28 Dec 2022 00:01:15 +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 4NhWrq5CQQz3C8c; Wed, 28 Dec 2022 00:01:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672185675; 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=3nlh9inYUcg6iVvwZ/0P6FxtzvEoCWAFLDQTgikcT9w=; b=P+VZm0t3WvV7euYMGApIx92anyG02u9b07fXloFJVIu7WibYU/qoN/lvh0y4LjRi9FJT79 kdOOY1+ZlHWIEFhgdFD4KLJA8uNPPK8VVrjPeK1/LKjq2rJedmyrjVAAJxEkHvjeL94ja2 Glsje4nRhMVnzFZ4fBlkFlXKln1U1Z4bYGMpx22EQvW4eQ6HNhRnudF9D5wyPv1V+BL2iQ TyAWHNaNuowZUMagfX78Ln7koetNZlciPlfyZiFFr31MmW1L1nn0Ax1XreWXrvrhC3I3hm em6bpYwmPxHEzYtXxcFucpUnlw9cpHqDTvDLBcjUfaamrKuYNvfw/EqMyUWpPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672185675; 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=3nlh9inYUcg6iVvwZ/0P6FxtzvEoCWAFLDQTgikcT9w=; b=Oerym1GpfdUUgGecvidt+gGgbFhhpT+SIfmMq/omkcnh+R3PZs//MqJMWX2tbZn3WRx/Wi Fo3GH2mFV+6CDmWvRwCtqG2wNDXNaoTHP9SbETlIOHuZzr30Rb9uL45EN2ELGobCFgyYfu nT8DSic/YkALZAPj6BEgKeGGArNqh4AUjv/xwHWl3UGV9pRjDG9iRBvmNHk7PYI8R+MSua WkAzaVrtiSdXF0dWtOWO6Fb/z/NKA5tQclF+oaLxIkzd3TCCJmSB6JuSsHdCNfkfjZ/6Io YyPHLFHqJUYxiRmjXtv+awEx4Q1Dn6tGTlln4//xjl9v0WRo7Ws4okJ377q10g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672185675; a=rsa-sha256; cv=none; b=uv4DrdlVm/cNJAaKfais75gxMRWac4XnHl5zqwmQiljv5roHVmGxxyrB+X1ME0G0LL4neC IikujBjTI4AemN1CsvYSfkUKNrs85EHi0CQRy/OXf5rXvHeZBgAREt8QN3EGYgfTELpCMQ AlcDfpSZq1oPro+gjJErA5/LJlpMoxcvhMf4sg8XoSEki0gHglulyyHTwKs+5j7G3pIw5p anmPBCTHNlfTJifthYh4+VCaC3Ee96Us9oVj86aBfcNRU3eCI6nEeJmMyISh63oyUvYlLK fhJLLatlYG7HOcoDkmmSo37tkmRPmsxr/rb0zE81/nKct/Xi9HYbEceHyzooEg== 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 4NhWrq4G1hzVPl; Wed, 28 Dec 2022 00:01:15 +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 2BS01FY3079038; Wed, 28 Dec 2022 00:01:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BS01FlV079037; Wed, 28 Dec 2022 00:01:15 GMT (envelope-from git) Date: Wed, 28 Dec 2022 00:01:15 GMT Message-Id: <202212280001.2BS01FlV079037@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 07be7517270e - main - ktls: Post receive errors on partially closed sockets. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 07be7517270e7cc8f51612efce9e6375ad1fc12e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=07be7517270e7cc8f51612efce9e6375ad1fc12e commit 07be7517270e7cc8f51612efce9e6375ad1fc12e Author: John Baldwin AuthorDate: 2022-12-28 00:00:17 +0000 Commit: John Baldwin CommitDate: 2022-12-28 00:00:17 +0000 ktls: Post receive errors on partially closed sockets. If an error such as an invalid record or one whose decryption fails is detected on a socket that has received a RST then ktls_drop() could ignore the error since INP_DROPPED could already be set. In this case soreceive_generic hangs since it does not return from a KTLS socket with pending encrypted data unless there is an error (so_error) (this behavior is to ensure that soreceive_generic doesn't return a premature EOF when there is pending data still being decrypted). Note that this was a bug prior to 69542f26820b7edb8351398b36edda5299c1db56 as tcp_usr_abort would also have ignored the error in this case. Reviewed by: gallatin Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D37775 --- sys/kern/uipc_ktls.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/kern/uipc_ktls.c b/sys/kern/uipc_ktls.c index 5648598e2b0a..330a7a2dbdcd 100644 --- a/sys/kern/uipc_ktls.c +++ b/sys/kern/uipc_ktls.c @@ -2317,8 +2317,12 @@ ktls_drop(struct socket *so, int error) CURVNET_RESTORE(); if (tp != NULL) INP_WUNLOCK(inp); - } else + } else { + so->so_error = error; + SOCK_RECVBUF_LOCK(so); + sorwakeup_locked(so); INP_WUNLOCK(inp); + } NET_EPOCH_EXIT(et); }