Commit 53d57999 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

tls: rx: remove the message decrypted tracking 



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: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent abb47dc9

include/net/strparser.h

+0 −1
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ struct sk_skb_cb { 
	/* strp users' data follows */

	struct tls_msg {

		u8 control;

		u8 decrypted;

	} tls;

	/* temp_reg is a temporary register used for bpf_convert_data_end_access

	 * when dst_reg == src_reg.

net/tls/tls_sw.c

+0 −10
Original line number Diff line number Diff line
@@ -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_prot_info *prot = &tls_ctx->prot_info;

	struct strp_msg *rxm = strp_msg(skb);

	struct tls_msg *tlm = tls_msg(skb);

	int pad, err;



	if (tlm->decrypted) {

		darg->zc = false;

		darg->async = false;

		return 0;

	}



	if (tls_ctx->rx_conf == TLS_HW) {

		err = tls_device_decrypted(sk, tls_ctx, skb, rxm);

		if (err < 0)

			return err;

		if (err > 0) {

			tlm->decrypted = 1;

			darg->zc = false;

			darg->async = false;

			goto decrypt_done;
@@ -1610,7 +1602,6 @@ static int decrypt_skb_update(struct sock *sk, struct sk_buff *skb, 
	rxm->full_len -= pad;

	rxm->offset += prot->prepend_size;

	rxm->full_len -= prot->overhead_size;

	tlm->decrypted = 1;

decrypt_next:

	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)

		goto read_failure;



	tlm->decrypted = 0;

	tlm->control = header[0];



	data_len = ((header[4] & 0xFF) | (header[3] << 8));