Commit 9559d2ff authored by Justin Worrell's avatar Justin Worrell Committed by Trond Myklebust
Browse files

SUNRPC: call xs_sock_process_cmsg for all cmsg 



xs_sock_recv_cmsg was failing to call xs_sock_process_cmsg for any cmsg
type other than TLS_RECORD_TYPE_ALERT (TLS_RECORD_TYPE_DATA, and other
values not handled.) Based on my reading of the previous commit
(cc5d5908: sunrpc: fix client side handling of tls alerts), it looks
like only iov_iter_revert should be conditional on TLS_RECORD_TYPE_ALERT
(but that other cmsg types should still call xs_sock_process_cmsg). On
my machine, I was unable to connect (over mtls) to an NFS share hosted
on FreeBSD. With this patch applied, I am able to mount the share again.

Fixes: cc5d5908 ("sunrpc: fix client side handling of tls alerts")
Signed-off-by: default avatarJustin Worrell <jworrell@gmail.com>
Reviewed-and-tested-by: default avatarScott Mayhew <smayhew@redhat.com>
Link: https://lore.kernel.org/r/20250904211038.12874-3-jworrell@gmail.com


Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent 199cd9e8

net/sunrpc/xprtsock.c

+3 −3
Original line number Diff line number Diff line
@@ -407,8 +407,8 @@ xs_sock_recv_cmsg(struct socket *sock, unsigned int *msg_flags, int flags) 
	iov_iter_kvec(&msg.msg_iter, ITER_DEST, &alert_kvec, 1,

		      alert_kvec.iov_len);

	ret = sock_recvmsg(sock, &msg, flags);

	if (ret > 0 &&

	    tls_get_record_type(sock->sk, &u.cmsg) == TLS_RECORD_TYPE_ALERT) {

	if (ret > 0) {

		if (tls_get_record_type(sock->sk, &u.cmsg) == TLS_RECORD_TYPE_ALERT)

			iov_iter_revert(&msg.msg_iter, ret);

		ret = xs_sock_process_cmsg(sock, &msg, msg_flags, &u.cmsg,

					   -EAGAIN);