ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 04:33:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

tls: rx: remove the message decrypted tracking

Browse Source 
We no longer allow a decrypted skb to remain linked to ctx->recv_pkt.
Anything on the list is decrypted, anything on ctx->recv_pkt needs
to be decrypted.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jakub Kicinski
2022-07-14 22:22:28 -07:00
committed by David S. Miller
parent abb47dc95d
commit 53d57999fe
2 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/net/strparser.h
View File

@@ -72,7 +72,6 @@ struct sk_skb_cb {
/* strp users' data follows */ /* strp users' data follows */
struct tls_msg { struct tls_msg {
u8 control; u8 control;
u8 decrypted;
} tls; } tls;
/* temp_reg is a temporary register used for bpf_convert_data_end_access /* temp_reg is a temporary register used for bpf_convert_data_end_access
* when dst_reg == src_reg. * when dst_reg == src_reg.

10
net/tls/tls_sw.c
View File

@@ -1563,21 +1563,13 @@ static int decrypt_skb_update(struct sock *sk, struct sk_buff *skb,
struct tls_context *tls_ctx = tls_get_ctx(sk); struct tls_context *tls_ctx = tls_get_ctx(sk);
struct tls_prot_info *prot = &tls_ctx->prot_info; struct tls_prot_info *prot = &tls_ctx->prot_info;
struct strp_msg *rxm = strp_msg(skb); struct strp_msg *rxm = strp_msg(skb);
struct tls_msg *tlm = tls_msg(skb);
int pad, err; int pad, err;
if (tlm->decrypted) {
darg->zc = false;
darg->async = false;
return 0;
}
if (tls_ctx->rx_conf == TLS_HW) { if (tls_ctx->rx_conf == TLS_HW) {
err = tls_device_decrypted(sk, tls_ctx, skb, rxm); err = tls_device_decrypted(sk, tls_ctx, skb, rxm);
if (err < 0) if (err < 0)
return err; return err;
if (err > 0) { if (err > 0) {
tlm->decrypted = 1;
darg->zc = false; darg->zc = false;
darg->async = false; darg->async = false;
goto decrypt_done; goto decrypt_done;
@@ -1610,7 +1602,6 @@ decrypt_done:
rxm->full_len -= pad; rxm->full_len -= pad;
rxm->offset += prot->prepend_size; rxm->offset += prot->prepend_size;
rxm->full_len -= prot->overhead_size; rxm->full_len -= prot->overhead_size;
tlm->decrypted = 1;
decrypt_next: decrypt_next:
tls_advance_record_sn(sk, prot, &tls_ctx->rx); tls_advance_record_sn(sk, prot, &tls_ctx->rx);
@@ -2130,7 +2121,6 @@ static int tls_read_size(struct strparser *strp, struct sk_buff *skb)
if (ret < 0) if (ret < 0)
goto read_failure; goto read_failure;
tlm->decrypted = 0;
tlm->control = header[0]; tlm->control = header[0];
data_len = ((header[4] & 0xFF) | (header[3] << 8)); data_len = ((header[4] & 0xFF) | (header[3] << 8));