Merge tag 'nfs-for-6.6-1' of git://git.linux-nfs.org/projects/anna/linux-nfs

[platform/kernel/linux-rpi.git] / net / sunrpc / xprtsock.c

diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 6e845e5..71cd916 100644 (file)
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -47,7 +47,7 @@
 #include <net/checksum.h>
 #include <net/udp.h>
 #include <net/tcp.h>
-#include <net/tls.h>
+#include <net/tls_prot.h>
 #include <net/handshake.h>
 
 #include <linux/bvec.h>
@@ -360,24 +360,27 @@ static int
 xs_sock_process_cmsg(struct socket *sock, struct msghdr *msg,
                     struct cmsghdr *cmsg, int ret)
 {
-       if (cmsg->cmsg_level == SOL_TLS &&
-           cmsg->cmsg_type == TLS_GET_RECORD_TYPE) {
-               u8 content_type = *((u8 *)CMSG_DATA(cmsg));
-
-               switch (content_type) {
-               case TLS_RECORD_TYPE_DATA:
-                       /* TLS sets EOR at the end of each application data
-                        * record, even though there might be more frames
-                        * waiting to be decrypted.
-                        */
-                       msg->msg_flags &= ~MSG_EOR;
-                       break;
-               case TLS_RECORD_TYPE_ALERT:
-                       ret = -ENOTCONN;
-                       break;
-               default:
-                       ret = -EAGAIN;
-               }
+       u8 content_type = tls_get_record_type(sock->sk, cmsg);
+       u8 level, description;
+
+       switch (content_type) {
+       case 0:
+               break;
+       case TLS_RECORD_TYPE_DATA:
+               /* TLS sets EOR at the end of each application data
+                * record, even though there might be more frames
+                * waiting to be decrypted.
+                */
+               msg->msg_flags &= ~MSG_EOR;
+               break;
+       case TLS_RECORD_TYPE_ALERT:
+               tls_alert_recv(sock->sk, msg, &level, &description);
+               ret = (level == TLS_ALERT_LEVEL_FATAL) ?
+                       -EACCES : -EAGAIN;
+               break;
+       default:
+               /* discard this record type */
+               ret = -EAGAIN;
        }
        return ret;
 }
@@ -777,6 +780,8 @@ static void xs_stream_data_receive(struct sock_xprt *transport)
        }
        if (ret == -ESHUTDOWN)
                kernel_sock_shutdown(transport->sock, SHUT_RDWR);
+       else if (ret == -EACCES)
+               xprt_wake_pending_tasks(&transport->xprt, -EACCES);
        else
                xs_poll_check_readable(transport);
 out:
@@ -1292,6 +1297,8 @@ static void xs_close(struct rpc_xprt *xprt)
 
        dprintk("RPC:       xs_close xprt %p\n", xprt);
 
+       if (transport->sock)
+               tls_handshake_close(transport->sock);
        xs_reset_transport(transport);
        xprt->reestablish_timeout = 0;
 }