Commit 15ef6b0e authored by Ayush Sawal's avatar Ayush Sawal Committed by Jakub Kicinski

chtls: Fix chtls resources release sequence

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: cc35c88a ("crypto : chtls - CPL handler definition")
Signed-off-by: default avatarVinay Kumar Yadav <vinay.yadav@chelsio.com>
Signed-off-by: default avatarAyush Sawal <ayush.sawal@chelsio.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent eade1e0a
...@@ -2058,9 +2058,9 @@ static void bl_abort_syn_rcv(struct sock *lsk, struct sk_buff *skb) ...@@ -2058,9 +2058,9 @@ static void bl_abort_syn_rcv(struct sock *lsk, struct sk_buff *skb)
queue = csk->txq_idx; queue = csk->txq_idx;
skb->sk = NULL; skb->sk = NULL;
do_abort_syn_rcv(child, lsk);
chtls_send_abort_rpl(child, skb, BLOG_SKB_CB(skb)->cdev, chtls_send_abort_rpl(child, skb, BLOG_SKB_CB(skb)->cdev,
CPL_ABORT_NO_RST, queue); CPL_ABORT_NO_RST, queue);
do_abort_syn_rcv(child, lsk);
} }
static int abort_syn_rcv(struct sock *sk, struct sk_buff *skb) 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) ...@@ -2090,8 +2090,8 @@ static int abort_syn_rcv(struct sock *sk, struct sk_buff *skb)
if (!sock_owned_by_user(psk)) { if (!sock_owned_by_user(psk)) {
int queue = csk->txq_idx; int queue = csk->txq_idx;
do_abort_syn_rcv(sk, psk);
chtls_send_abort_rpl(sk, skb, cdev, CPL_ABORT_NO_RST, queue); chtls_send_abort_rpl(sk, skb, cdev, CPL_ABORT_NO_RST, queue);
do_abort_syn_rcv(sk, psk);
} else { } else {
skb->sk = sk; skb->sk = sk;
BLOG_SKB_CB(skb)->backlog_rcv = bl_abort_syn_rcv; 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) ...@@ -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)) if (sk->sk_state == TCP_SYN_RECV && !abort_syn_rcv(sk, skb))
return; return;
chtls_release_resources(sk);
chtls_conn_done(sk);
} }
chtls_send_abort_rpl(sk, skb, BLOG_SKB_CB(skb)->cdev, chtls_send_abort_rpl(sk, skb, BLOG_SKB_CB(skb)->cdev,
rst_status, queue); rst_status, queue);
chtls_release_resources(sk);
chtls_conn_done(sk);
} }
static void chtls_abort_rpl_rss(struct sock *sk, struct sk_buff *skb) static void chtls_abort_rpl_rss(struct sock *sk, struct sk_buff *skb)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment