Unverified Commit d0d949e1 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!2997 [sync] PR-2902: net/tls: do not free tls_rec on async operation in bpf_exec_tx_verdict() 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/2902 
 
PR sync from: Liu Jian <liujian56@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/IO3C56N7X4VWNSR4RVHEJQ7PNLH7ILRA/ 
 
https://gitee.com/src-openeuler/kernel/issues/I8H5DK 
 
Link:https://gitee.com/openeuler/kernel/pulls/2997

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents c2cd749e 5ae698bf

net/tls/tls_sw.c

+2 −2
Original line number Diff line number Diff line
@@ -810,7 +810,7 @@ static int bpf_exec_tx_verdict(struct sk_msg *msg, struct sock *sk, 
	psock = sk_psock_get(sk);

	if (!psock || !policy) {

		err = tls_push_record(sk, flags, record_type);

		if (err && sk->sk_err == EBADMSG) {

		if (err && err != -EINPROGRESS && sk->sk_err == EBADMSG) {

			*copied -= sk_msg_free(sk, msg);

			tls_free_open_rec(sk);

			err = -sk->sk_err;
@@ -839,7 +839,7 @@ static int bpf_exec_tx_verdict(struct sk_msg *msg, struct sock *sk, 
	switch (psock->eval) {

	case __SK_PASS:

		err = tls_push_record(sk, flags, record_type);

		if (err && sk->sk_err == EBADMSG) {

		if (err && err != -EINPROGRESS && sk->sk_err == EBADMSG) {

			*copied -= sk_msg_free(sk, msg);

			tls_free_open_rec(sk);

			err = -sk->sk_err;