tls: don't reset prot->aad_size and prot->tail_size for TLS_HW

JIRA: https://issues.redhat.com/browse/RHEL-14902

commit b7c4f57
Author: Sabrina Dubroca <[email protected]>
Date:   Fri Oct 20 16:00:55 2023 +0200

    tls: don't reset prot->aad_size and prot->tail_size for TLS_HW

    Prior to commit 1a074f7 ("tls: also use init_prot_info in
    tls_set_device_offload"), setting TLS_HW on TX didn't touch
    prot->aad_size and prot->tail_size. They are set to 0 during context
    allocation (tls_prot_info is embedded in tls_context, kzalloc'd by
    tls_ctx_create).

    When the RX key is configured, tls_set_sw_offload is called (for both
    TLS_SW and TLS_HW). If the TX key is configured in TLS_HW mode after
    the RX key has been installed, init_prot_info will now overwrite the
    correct values of aad_size and tail_size, breaking SW decryption and
    causing -EBADMSG errors to be returned to userspace.

    Since TLS_HW doesn't use aad_size and tail_size at all (for TLS1.2,
    tail_size is always 0, and aad_size is equal to TLS_HEADER_SIZE +
    rec_seq_size), we can simply drop this hunk.

    Fixes: 1a074f7 ("tls: also use init_prot_info in tls_set_device_offload")
    Signed-off-by: Sabrina Dubroca <[email protected]>
    Acked-by: Jakub Kicinski <[email protected]>
    Tested-by: Ran Rozenstein <[email protected]>
    Link: https://lore.kernel.org/r/979d2f89a6a994d5bb49cae49a80be54150d094d.1697653889.git.sd@queasysnail.net
    Signed-off-by: Jakub Kicinski <[email protected]>

Signed-off-by: Sabrina Dubroca <[email protected]>

Author: Sabrina Dubroca

net/tls/tls.h

@@ -142,8 +142,7 @@ void tls_err_abort(struct sock *sk, int err);
 
 int init_prot_info(struct tls_prot_info *prot,
 		   const struct tls_crypto_info *crypto_info,
-		   const struct tls_cipher_desc *cipher_desc,
-		   int mode);
+		   const struct tls_cipher_desc *cipher_desc);
 int tls_set_sw_offload(struct sock *sk, int tx);
 void tls_update_rx_zc_capable(struct tls_context *tls_ctx);
 void tls_sw_strparser_arm(struct sock *sk, struct tls_context *ctx);

net/tls/tls_device.c

@@ -1113,7 +1113,7 @@ int tls_set_device_offload(struct sock *sk)
 		goto release_netdev;
 	}
 
-	rc = init_prot_info(prot, crypto_info, cipher_desc, TLS_HW);
+	rc = init_prot_info(prot, crypto_info, cipher_desc);
 	if (rc)
 		goto release_netdev;
 

net/tls/tls_sw.c

@@ -2640,8 +2640,7 @@ static struct tls_sw_context_rx *init_ctx_rx(struct tls_context *ctx)
 
 int init_prot_info(struct tls_prot_info *prot,
 		   const struct tls_crypto_info *crypto_info,
-		   const struct tls_cipher_desc *cipher_desc,
-		   int mode)
+		   const struct tls_cipher_desc *cipher_desc)
 {
 	u16 nonce_size = cipher_desc->nonce;
 
@@ -2654,11 +2653,6 @@ int init_prot_info(struct tls_prot_info *prot,
 		prot->tail_size = 0;
 	}
 
-	if (mode == TLS_HW) {
-		prot->aad_size = 0;
-		prot->tail_size = 0;
-	}
-
 	/* Sanity-check the sizes for stack allocations. */
 	if (nonce_size > TLS_MAX_IV_SIZE || prot->aad_size > TLS_MAX_AAD_SIZE)
 		return -EINVAL;
@@ -2718,7 +2712,7 @@ int tls_set_sw_offload(struct sock *sk, int tx)
 		goto free_priv;
 	}
 
-	rc = init_prot_info(prot, crypto_info, cipher_desc, TLS_SW);
+	rc = init_prot_info(prot, crypto_info, cipher_desc);
 	if (rc)
 		goto free_priv;