net: tls: Pass union tls_crypto_context pointer to memzero_explicit
Subsystems (3)
Simon Horman
reviewerPATCH v2 1/1 net: tls: Pass union tls_crypto_context pointer to memzero_explicit
Pass union tls_crypto_context pointer, rather than struct tls_crypto_info pointer, to memzero_explicit().
The address of the pointer is the same before and after.
But the new construct means that the size of the dereferenced pointer type matches the size being zeroed. Which aids static analysis.
As reported by Smatch:
.../tls_main.c:842 do_tls_setsockopt_conf() error: memzero_explicit() 'crypto_info' too small (4 vs 56)
No functional change intended.
Compile tested only.
---
Changes in v2:
- Added Reviewed-by tag from Przemek Kitszel
- Updated to use sizeof(*crypto_ctx), as suggested by Przemek Kitszel
- Link to v1: https://lore.kernel.org/r/[email protected]
--- net/tls/tls_main.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
net/tls/tls_main.c +6 -3
@@ -616,6 +616,7 @@ static int do_tls_setsockopt_conf(struct sock *sk, sockptr_t optval,struct tls_crypto_info *alt_crypto_info;struct tls_context *ctx =tls_get_ctx (sk);const struct tls_cipher_desc *cipher_desc; +union tls_crypto_context *crypto_ctx;int rc =0 ;int conf;
@@ -623,13 +624,15 @@ static int do_tls_setsockopt_conf(struct sock *sk, sockptr_t optval,return -EINVAL ;if (tx) { - crypto_info = &ctx->crypto_send.info; + crypto_ctx = &ctx->crypto_send; alt_crypto_info = &ctx->crypto_recv.info; }else { - crypto_info = &ctx->crypto_recv.info; + crypto_ctx = &ctx->crypto_recv; alt_crypto_info = &ctx->crypto_send.info; } + crypto_info = &crypto_ctx->info; +/* Currently we don't support set crypto info more than one time */ if (TLS_CRYPTO_INFO_READY (crypto_info))return -EBUSY ;
@@ -710,7 +713,7 @@ static int do_tls_setsockopt_conf(struct sock *sk, sockptr_t optval,return 0 ; err_crypto_info: -memzero_explicit (crypto_info,sizeof (union tls_crypto_context )); +memzero_explicit (crypto_ctx,sizeof (*crypto_ctx));return rc; }
Quoted 9 lines · On Mon, 08 Jul 2024 08:27:19 +0100 Simon Horman wrote:
Pass union
tls_crypto_contextpointer, rather than structtls_crypto_infopointer, tomemzero_explicit().The address of the pointer is the same before and after.
But the new construct means that the size of the dereferenced pointer type matches the size being zeroed. Which aids static analysis.As reported by Smatch:
Quoted 7 lines
.../tls_main.c:842do_tls_setsockopt_conf()error:memzero_explicit()'crypto_info' too small (4 vs 56)No functional change intended.
Compile tested only.Reviewed-by Przemek Kitszel <[email protected]>Signed-off-by Simon Horman <[email protected]>
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 8 lines · On Mon, 08 Jul 2024 08:27:19 +0100 you wrote:
Pass union
tls_crypto_contextpointer, rather than structtls_crypto_infopointer, tomemzero_explicit().The address of the pointer is the same before and after.
But the new construct means that the size of the dereferenced pointer type matches the size being zeroed. Which aids static analysis.[...]
Here is the summary with links:
- [net-next,v2] net: tls: Pass union tls_crypto_context pointer to memzero_explicit
https://git.kernel.org/netdev/net-next/c/0d9e699d3421
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html