Merge: Two fixes for NFS' TLS connection instability handling

ptalbert · ptalbert · commit 4011d47a1dff · 2025-02-10T03:47:10.000-05:00
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/6148 JIRA: https://issues.redhat.com/browse/RHEL-60028 Depends: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/6147 Signed-off-by: Benjamin Coddington <bcodding@redhat.com> Approved-by: Sabrina Dubroca <sdubroca@redhat.com> Approved-by: Florian Westphal <fwestpha@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Patrick Talbert <ptalbert@redhat.com>
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
@@ -1289,6 +1289,7 @@ static void xs_reset_transport(struct sock_xprt *transport)
 	transport->file = NULL;
 
 	sk->sk_user_data = NULL;
+	sk->sk_sndtimeo = 0;
 
 	xs_restore_old_callbacks(transport, sk);
 	xprt_clear_connected(xprt);
diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c
@@ -454,7 +454,7 @@ int tls_tx_records(struct sock *sk, int flags)
 
 tx_err:
 	if (rc < 0 && rc != -EAGAIN)
-		tls_err_abort(sk, -EBADMSG);
+		tls_err_abort(sk, rc);
 
 	return rc;
 }

Original file line number	Diff line number	Diff line change
`@@ -454,7 +454,7 @@ int tls_tx_records(struct sock *sk, int flags)`
`454`	`454`
`455`	`455`	`tx_err:`
`456`	`456`	`if (rc < 0 && rc != -EAGAIN)`
`457`		`- tls_err_abort(sk, -EBADMSG);`
	`457`	`+ tls_err_abort(sk, rc);`
`458`	`458`
`459`	`459`	`return rc;`
`460`	`460`	`}`