tls: Fix tls_device receive (d069b780) · Commits · 戴 / test

Currently, the receive function fails to handle records already decrypted by the device due to the commit mentioned below. This commit advances the TLS record sequence number and prepares the context to handle the next record. Fixes: ("net: tls: Refactor control message handling on recv") Signed-off-by:

Boris Pismenny <borisp@mellanox.com> Reviewed-by:

Eran Ben Elisha <eranbe@mellanox.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

net/tls/tls_sw.c

+14 −11

Original line number	Diff line number	Diff line
		@@ -1467,13 +1467,16 @@ static int decrypt_skb_update(struct sock sk, struct sk_buff skb,
		struct strp_msg *rxm = strp_msg(skb);
		int err = 0;

		if (!ctx->decrypted) {
		#ifdef CONFIG_TLS_DEVICE
		err = tls_device_decrypted(sk, skb);
		if (err < 0)
		return err;
		#endif
		/* Still not decrypted after tls_device */
		if (!ctx->decrypted) {
		err = decrypt_internal(sk, skb, dest, NULL, chunk, zc, async);
		err = decrypt_internal(sk, skb, dest, NULL, chunk, zc,
		async);
		if (err < 0) {
		if (err == -EINPROGRESS)
		tls_advance_record_sn(sk, &tls_ctx->rx,
		@@ -1481,9 +1484,9 @@ static int decrypt_skb_update(struct sock sk, struct sk_buff skb,

		return err;
		}
		}

		rxm->full_len -= padding_length(ctx, tls_ctx, skb);

		rxm->offset += prot->prepend_size;
		rxm->full_len -= prot->overhead_size;
		tls_advance_record_sn(sk, &tls_ctx->rx, version);

Admin message