Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96fb3d28 authored by Ayush Sawal's avatar Ayush Sawal Committed by Greg Kroah-Hartman
Browse files

chtls: Fix chtls resources release sequence 



[ 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: 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>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fac9b53c

drivers/crypto/chelsio/chtls/chtls_cm.c

+4 −5
Original line number Diff line number Diff line
@@ -1905,9 +1905,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)
@@ -1937,8 +1937,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;
@@ -1981,12 +1981,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)