git: 07be7517270e - main - ktls: Post receive errors on partially closed sockets.

[John Baldwin]

The branch main has been updated by jhb:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=07be7517270e7cc8f51612efce9e6375ad1fc12e

commit 07be7517270e7cc8f51612efce9e6375ad1fc12e
Author:     John Baldwin <j...@freebsd.org>
AuthorDate: 2022-12-28 00:00:17 +0000
Commit:     John Baldwin <j...@freebsd.org>
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);
 }