iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Prior to commit 1a074f7618 ("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: 1a074f7618 ("tls: also use init_prot_info in tls_set_device_offload")
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Acked-by: Jakub Kicinski <kuba@kernel.org>
Tested-by: Ran Rozenstein <ranro@nvidia.com>
Link: https://lore.kernel.org/r/979d2f89a6a994d5bb49cae49a80be54150d094d.1697653889.git.sd@queasysnail.net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Sabrina Dubroca 2023-10-20 16:00:55 +02:00 committed by Jakub Kicinski
parent 6e7ce2d71b
commit b7c4f5730a
3 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/tls/tls.h
View File

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

2
net/tls/tls_device.c
View File

@ -1099,7 +1099,7 @@ int tls_set_device_offload(struct sock *sk)
goto release_netdev; 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) if (rc)
goto release_netdev; goto release_netdev;

10
net/tls/tls_sw.c
View File

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