]> www.infradead.org Git - users/dwmw2/linux.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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 17 Jan 2021 13:04:20 +0000 (14:04 +0100)
[ Upstream commit 15ef6b0e30b354253e2c10b3836bc59767eb162b ]

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: cc35c88ae4db ("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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/crypto/chelsio/chtls/chtls_cm.c

index 050c7ebf6a4f4f6b3df683bbc4b0de9578d65fcd..fd3092a4378e49fb26d2deeeb949492e08846ef8 100644 (file)
@@ -1884,9 +1884,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)
@@ -1916,8 +1916,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;
@@ -1960,12 +1960,11 @@ 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, csk->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)