1 files changed, 67 insertions, 25 deletions

diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c
index d824d548447e..6f5c1146da4a 100644
--- a/net/tls/tls_main.c
+++ b/net/tls/tls_main.c
@@ -52,20 +52,23 @@ enum {
 };
 
 enum {
-        TLS_BASE_TX,
+        TLS_BASE,
         TLS_SW_TX,
+        TLS_SW_RX,
+        TLS_SW_RXTX,
         TLS_NUM_CONFIG,
 };
 
 static struct proto *saved_tcpv6_prot;
 static DEFINE_MUTEX(tcpv6_prot_mutex);
 static struct proto tls_prots[TLS_NUM_PROTS][TLS_NUM_CONFIG];
+static struct proto_ops tls_sw_proto_ops;
 
 static inline void update_sk_prot(struct sock *sk, struct tls_context *ctx)
 {
         int ip_ver = sk->sk_family == AF_INET6 ? TLSV6 : TLSV4;
 
-        sk->sk_prot = &tls_prots[ip_ver][ctx->tx_conf];
+        sk->sk_prot = &tls_prots[ip_ver][ctx->conf];
 }
 
 int wait_on_pending_writer(struct sock *sk, long *timeo)
@@ -238,7 +241,7 @@ static void tls_sk_proto_close(struct sock *sk, long timeout)
         lock_sock(sk);
         sk_proto_close = ctx->sk_proto_close;
 
-        if (ctx->tx_conf == TLS_BASE_TX) {
+        if (ctx->conf == TLS_BASE) {
                 kfree(ctx);
                 goto skip_tx_cleanup;
         }
@@ -259,11 +262,16 @@ static void tls_sk_proto_close(struct sock *sk, long timeout)
                 }
         }
 
-        kfree(ctx->rec_seq);
-        kfree(ctx->iv);
+        kfree(ctx->tx.rec_seq);
+        kfree(ctx->tx.iv);
+        kfree(ctx->rx.rec_seq);
+        kfree(ctx->rx.iv);
 
-        if (ctx->tx_conf == TLS_SW_TX)
-                tls_sw_free_tx_resources(sk);
+        if (ctx->conf == TLS_SW_TX ||
+            ctx->conf == TLS_SW_RX ||
+            ctx->conf == TLS_SW_RXTX) {
+                tls_sw_free_resources(sk);
+        }
 
 skip_tx_cleanup:
         release_sock(sk);
@@ -319,9 +327,9 @@ static int do_tls_getsockopt_tx(struct sock *sk, char __user *optval,
                 }
                 lock_sock(sk);
                 memcpy(crypto_info_aes_gcm_128->iv,
-                       ctx->iv + TLS_CIPHER_AES_GCM_128_SALT_SIZE,
+                       ctx->tx.iv + TLS_CIPHER_AES_GCM_128_SALT_SIZE,
                        TLS_CIPHER_AES_GCM_128_IV_SIZE);
-                memcpy(crypto_info_aes_gcm_128->rec_seq, ctx->rec_seq,
+                memcpy(crypto_info_aes_gcm_128->rec_seq, ctx->tx.rec_seq,
                        TLS_CIPHER_AES_GCM_128_REC_SEQ_SIZE);
                 release_sock(sk);
                 if (copy_to_user(optval,
@@ -365,20 +373,24 @@ static int tls_getsockopt(struct sock *sk, int level, int optname,
         return do_tls_getsockopt(sk, optname, optval, optlen);
 }
 
-static int do_tls_setsockopt_tx(struct sock *sk, char __user *optval,
-                                unsigned int optlen)
+static int do_tls_setsockopt_conf(struct sock *sk, char __user *optval,
+                                  unsigned int optlen, int tx)
 {
         struct tls_crypto_info *crypto_info;
         struct tls_context *ctx = tls_get_ctx(sk);
         int rc = 0;
-        int tx_conf;
+        int conf;
 
         if (!optval || (optlen < sizeof(*crypto_info))) {
                 rc = -EINVAL;
                 goto out;
         }
 
-        crypto_info = &ctx->crypto_send;
+        if (tx)
+                crypto_info = &ctx->crypto_send;
+        else
+                crypto_info = &ctx->crypto_recv;
+
         /* Currently we don't support set crypto info more than one time */
         if (TLS_CRYPTO_INFO_READY(crypto_info)) {
                 rc = -EBUSY;
@@ -417,15 +429,31 @@ static int do_tls_setsockopt_tx(struct sock *sk, char __user *optval,
         }
 
         /* currently SW is default, we will have ethtool in future */
-        rc = tls_set_sw_offload(sk, ctx);
-        tx_conf = TLS_SW_TX;
+        if (tx) {
+                rc = tls_set_sw_offload(sk, ctx, 1);
+                if (ctx->conf == TLS_SW_RX)
+                        conf = TLS_SW_RXTX;
+                else
+                        conf = TLS_SW_TX;
+        } else {
+                rc = tls_set_sw_offload(sk, ctx, 0);
+                if (ctx->conf == TLS_SW_TX)
+                        conf = TLS_SW_RXTX;
+                else
+                        conf = TLS_SW_RX;
+        }
+
         if (rc)
                 goto err_crypto_info;
 
-        ctx->tx_conf = tx_conf;
+        ctx->conf = conf;
         update_sk_prot(sk, ctx);
-        ctx->sk_write_space = sk->sk_write_space;
-        sk->sk_write_space = tls_write_space;
+        if (tx) {
+                ctx->sk_write_space = sk->sk_write_space;
+                sk->sk_write_space = tls_write_space;
+        } else {
+                sk->sk_socket->ops = &tls_sw_proto_ops;
+        }
         goto out;
 
 err_crypto_info:
@@ -441,8 +469,10 @@ static int do_tls_setsockopt(struct sock *sk, int optname,
 
         switch (optname) {
         case TLS_TX:
+        case TLS_RX:
                 lock_sock(sk);
-                rc = do_tls_setsockopt_tx(sk, optval, optlen);
+                rc = do_tls_setsockopt_conf(sk, optval, optlen,
+                                            optname == TLS_TX);
                 release_sock(sk);
                 break;
         default:
@@ -465,14 +495,22 @@ static int tls_setsockopt(struct sock *sk, int level, int optname,
 
 static void build_protos(struct proto *prot, struct proto *base)
 {
-        prot[TLS_BASE_TX] = *base;
-        prot[TLS_BASE_TX].setsockopt    = tls_setsockopt;
-        prot[TLS_BASE_TX].getsockopt    = tls_getsockopt;
-        prot[TLS_BASE_TX].close         = tls_sk_proto_close;
+        prot[TLS_BASE] = *base;
+        prot[TLS_BASE].setsockopt       = tls_setsockopt;
+        prot[TLS_BASE].getsockopt       = tls_getsockopt;
+        prot[TLS_BASE].close            = tls_sk_proto_close;
 
-        prot[TLS_SW_TX] = prot[TLS_BASE_TX];
+        prot[TLS_SW_TX] = prot[TLS_BASE];
         prot[TLS_SW_TX].sendmsg         = tls_sw_sendmsg;
         prot[TLS_SW_TX].sendpage        = tls_sw_sendpage;
+
+        prot[TLS_SW_RX] = prot[TLS_BASE];
+        prot[TLS_SW_RX].recvmsg         = tls_sw_recvmsg;
+        prot[TLS_SW_RX].close           = tls_sk_proto_close;
+
+        prot[TLS_SW_RXTX] = prot[TLS_SW_TX];
+        prot[TLS_SW_RXTX].recvmsg       = tls_sw_recvmsg;
+        prot[TLS_SW_RXTX].close         = tls_sk_proto_close;
 }
 
 static int tls_init(struct sock *sk)
@@ -513,7 +551,7 @@ static int tls_init(struct sock *sk)
                 mutex_unlock(&tcpv6_prot_mutex);
         }
 
-        ctx->tx_conf = TLS_BASE_TX;
+        ctx->conf = TLS_BASE;
         update_sk_prot(sk, ctx);
 out:
         return rc;
@@ -531,6 +569,10 @@ static int __init tls_register(void)
 {
         build_protos(tls_prots[TLSV4], &tcp_prot);
 
+        tls_sw_proto_ops = inet_stream_ops;
+        tls_sw_proto_ops.poll = tls_sw_poll;
+        tls_sw_proto_ops.splice_read = tls_sw_splice_read;
+
         tcp_register_ulp(&tcp_tls_ulp_ops);
 
         return 0;