1 files changed, 59 insertions, 24 deletions

diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c
index 53b4ad94e74a..91d21b048a9b 100644
--- a/net/tls/tls_sw.c
+++ b/net/tls/tls_sw.c
@@ -2054,7 +2054,16 @@ static void tls_data_ready(struct sock *sk)
         }
 }
 
-void tls_sw_free_resources_tx(struct sock *sk)
+void tls_sw_cancel_work_tx(struct tls_context *tls_ctx)
+{
+        struct tls_sw_context_tx *ctx = tls_sw_ctx_tx(tls_ctx);
+
+        set_bit(BIT_TX_CLOSING, &ctx->tx_bitmask);
+        set_bit(BIT_TX_SCHEDULED, &ctx->tx_bitmask);
+        cancel_delayed_work_sync(&ctx->tx_work.work);
+}
+
+void tls_sw_release_resources_tx(struct sock *sk)
 {
         struct tls_context *tls_ctx = tls_get_ctx(sk);
         struct tls_sw_context_tx *ctx = tls_sw_ctx_tx(tls_ctx);
@@ -2065,11 +2074,6 @@ void tls_sw_free_resources_tx(struct sock *sk)
         if (atomic_read(&ctx->encrypt_pending))
                 crypto_wait_req(-EINPROGRESS, &ctx->async_wait);
 
-        release_sock(sk);
-        cancel_delayed_work_sync(&ctx->tx_work.work);
-        lock_sock(sk);
-
-        /* Tx whatever records we can transmit and abandon the rest */
         tls_tx_records(sk, -1);
 
         /* Free up un-sent records in tx_list. First, free
@@ -2092,6 +2096,11 @@ void tls_sw_free_resources_tx(struct sock *sk)
 
         crypto_free_aead(ctx->aead_send);
         tls_free_open_rec(sk);
+}
+
+void tls_sw_free_ctx_tx(struct tls_context *tls_ctx)
+{
+        struct tls_sw_context_tx *ctx = tls_sw_ctx_tx(tls_ctx);
 
         kfree(ctx);
 }
@@ -2110,25 +2119,40 @@ void tls_sw_release_resources_rx(struct sock *sk)
                 skb_queue_purge(&ctx->rx_list);
                 crypto_free_aead(ctx->aead_recv);
                 strp_stop(&ctx->strp);
-                write_lock_bh(&sk->sk_callback_lock);
-                sk->sk_data_ready = ctx->saved_data_ready;
-                write_unlock_bh(&sk->sk_callback_lock);
-                release_sock(sk);
-                strp_done(&ctx->strp);
-                lock_sock(sk);
+                /* If tls_sw_strparser_arm() was not called (cleanup paths)
+                 * we still want to strp_stop(), but sk->sk_data_ready was
+                 * never swapped.
+                 */
+                if (ctx->saved_data_ready) {
+                        write_lock_bh(&sk->sk_callback_lock);
+                        sk->sk_data_ready = ctx->saved_data_ready;
+                        write_unlock_bh(&sk->sk_callback_lock);
+                }
         }
 }
 
-void tls_sw_free_resources_rx(struct sock *sk)
+void tls_sw_strparser_done(struct tls_context *tls_ctx)
 {
-        struct tls_context *tls_ctx = tls_get_ctx(sk);
         struct tls_sw_context_rx *ctx = tls_sw_ctx_rx(tls_ctx);
 
-        tls_sw_release_resources_rx(sk);
+        strp_done(&ctx->strp);
+}
+
+void tls_sw_free_ctx_rx(struct tls_context *tls_ctx)
+{
+        struct tls_sw_context_rx *ctx = tls_sw_ctx_rx(tls_ctx);
 
         kfree(ctx);
 }
 
+void tls_sw_free_resources_rx(struct sock *sk)
+{
+        struct tls_context *tls_ctx = tls_get_ctx(sk);
+
+        tls_sw_release_resources_rx(sk);
+        tls_sw_free_ctx_rx(tls_ctx);
+}
+
 /* The work handler to transmitt the encrypted records in tx_list */
 static void tx_work_handler(struct work_struct *work)
 {
@@ -2137,11 +2161,17 @@ static void tx_work_handler(struct work_struct *work)
                                                struct tx_work, work);
         struct sock *sk = tx_work->sk;
         struct tls_context *tls_ctx = tls_get_ctx(sk);
-        struct tls_sw_context_tx *ctx = tls_sw_ctx_tx(tls_ctx);
+        struct tls_sw_context_tx *ctx;
 
-        if (!test_and_clear_bit(BIT_TX_SCHEDULED, &ctx->tx_bitmask))
+        if (unlikely(!tls_ctx))
                 return;
 
+        ctx = tls_sw_ctx_tx(tls_ctx);
+        if (test_bit(BIT_TX_CLOSING, &ctx->tx_bitmask))
+                return;
+
+        if (!test_and_clear_bit(BIT_TX_SCHEDULED, &ctx->tx_bitmask))
+                return;
         lock_sock(sk);
         tls_tx_records(sk, -1);
         release_sock(sk);
@@ -2160,6 +2190,18 @@ void tls_sw_write_space(struct sock *sk, struct tls_context *ctx)
         }
 }
 
+void tls_sw_strparser_arm(struct sock *sk, struct tls_context *tls_ctx)
+{
+        struct tls_sw_context_rx *rx_ctx = tls_sw_ctx_rx(tls_ctx);
+
+        write_lock_bh(&sk->sk_callback_lock);
+        rx_ctx->saved_data_ready = sk->sk_data_ready;
+        sk->sk_data_ready = tls_data_ready;
+        write_unlock_bh(&sk->sk_callback_lock);
+
+        strp_check_rcv(&rx_ctx->strp);
+}
+
 int tls_set_sw_offload(struct sock *sk, struct tls_context *ctx, int tx)
 {
         struct tls_context *tls_ctx = tls_get_ctx(sk);
@@ -2357,13 +2399,6 @@ int tls_set_sw_offload(struct sock *sk, struct tls_context *ctx, int tx)
                 cb.parse_msg = tls_read_size;
 
                 strp_init(&sw_ctx_rx->strp, sk, &cb);
-
-                write_lock_bh(&sk->sk_callback_lock);
-                sw_ctx_rx->saved_data_ready = sk->sk_data_ready;
-                sk->sk_data_ready = tls_data_ready;
-                write_unlock_bh(&sk->sk_callback_lock);
-
-                strp_check_rcv(&sw_ctx_rx->strp);
         }
 
         goto out;