]> git.baikalelectronics.ru Git - kernel.git/commitdiff
chtls: Fix chtls resources release sequence
authorAyush Sawal <ayush.sawal@chelsio.com>
Wed, 6 Jan 2021 04:29:12 +0000 (09:59 +0530)
committerJakub Kicinski <kuba@kernel.org>
Fri, 8 Jan 2021 01:06:02 +0000 (17:06 -0800)
CPL_ABORT_RPL is sent after releasing the resources by calling
chtls_release_resources(sk); and chtls_conn_done(sk);
eventually causing kernel panic. Fixing it by calling release
in appropriate order.

Fixes: d389a7c785e7 ("crypto : chtls - CPL handler definition")
Signed-off-by: Vinay Kumar Yadav <vinay.yadav@chelsio.com>
Signed-off-by: Ayush Sawal <ayush.sawal@chelsio.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c

index 1c6d3c93a0c828ce0761cbbf6406722e6a862002..51dd030b3b3661eb2d2fa37f7416fadda447557e 100644 (file)
@@ -2058,9 +2058,9 @@ static void bl_abort_syn_rcv(struct sock *lsk, struct sk_buff *skb)
        queue = csk->txq_idx;
 
        skb->sk = NULL;
-       do_abort_syn_rcv(child, lsk);
        chtls_send_abort_rpl(child, skb, BLOG_SKB_CB(skb)->cdev,
                             CPL_ABORT_NO_RST, queue);
+       do_abort_syn_rcv(child, lsk);
 }
 
 static int abort_syn_rcv(struct sock *sk, struct sk_buff *skb)
@@ -2090,8 +2090,8 @@ static int abort_syn_rcv(struct sock *sk, struct sk_buff *skb)
        if (!sock_owned_by_user(psk)) {
                int queue = csk->txq_idx;
 
-               do_abort_syn_rcv(sk, psk);
                chtls_send_abort_rpl(sk, skb, cdev, CPL_ABORT_NO_RST, queue);
+               do_abort_syn_rcv(sk, psk);
        } else {
                skb->sk = sk;
                BLOG_SKB_CB(skb)->backlog_rcv = bl_abort_syn_rcv;
@@ -2135,12 +2135,12 @@ static void chtls_abort_req_rss(struct sock *sk, struct sk_buff *skb)
                if (sk->sk_state == TCP_SYN_RECV && !abort_syn_rcv(sk, skb))
                        return;
 
-               chtls_release_resources(sk);
-               chtls_conn_done(sk);
        }
 
        chtls_send_abort_rpl(sk, skb, BLOG_SKB_CB(skb)->cdev,
                             rst_status, queue);
+       chtls_release_resources(sk);
+       chtls_conn_done(sk);
 }
 
 static void chtls_abort_rpl_rss(struct sock *sk, struct sk_buff *skb)