wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-03 20:54:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

linuxkm/lkcapi_sha_glue.c: explicitly free hash state in wrappers.

Browse Source
This commit is contained in:
Daniel Pouzzner
2025-06-15 14:40:42 -05:00
parent 89e51025ab
commit d5ce9744a4
1 changed files with 52 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
linuxkm/lkcapi_sha_glue.c
View File

@@ -414,7 +414,7 @@ WC_MAYBE_UNUSED static int sha3_test_once(void) {
#define WC_LINUXKM_SHA_IMPLEMENT(name, digest_size, block_size, \ #define WC_LINUXKM_SHA_IMPLEMENT(name, digest_size, block_size, \
this_cra_name, this_cra_driver_name, \ this_cra_name, this_cra_driver_name, \
init_f, update_f, final_f, \ init_f, update_f, final_f, \
test_routine) \ free_f, test_routine) \
\ \
\ \
static int km_ ## name ## _init(struct shash_desc *desc) { \ static int km_ ## name ## _init(struct shash_desc *desc) { \
@@ -436,8 +436,10 @@ static int km_ ## name ## _update(struct shash_desc *desc, const u8 *data, \
\ \
if (ret == 0) \ if (ret == 0) \
return 0; \ return 0; \
else \ else { \
free_f(&ctx-> name ## _state); \
return -EINVAL; \ return -EINVAL; \
} \
} \ } \
\ \
static int km_ ## name ## _final(struct shash_desc *desc, u8 *out) { \ static int km_ ## name ## _final(struct shash_desc *desc, u8 *out) { \
@@ -445,6 +447,8 @@ static int km_ ## name ## _final(struct shash_desc *desc, u8 *out) { \
\ \
int ret = final_f(&ctx-> name ## _state, out); \ int ret = final_f(&ctx-> name ## _state, out); \
\ \
free_f(&ctx-> name ## _state); \
\
if (ret == 0) \ if (ret == 0) \
return 0; \ return 0; \
else \ else \
@@ -458,8 +462,10 @@ static int km_ ## name ## _finup(struct shash_desc *desc, const u8 *data, \
\ \
int ret = update_f(&ctx-> name ## _state, data, len); \ int ret = update_f(&ctx-> name ## _state, data, len); \
\ \
if (ret != 0) \ if (ret != 0) { \
free_f(&ctx-> name ## _state); \
return -EINVAL; \ return -EINVAL; \
} \
\ \
return km_ ## name ## _final(desc, out); \ return km_ ## name ## _final(desc, out); \
} \ } \
@@ -510,7 +516,7 @@ struct wc_swallow_the_semicolon
#define WC_LINUXKM_SHA3_IMPLEMENT(name, digest_size, block_size, \ #define WC_LINUXKM_SHA3_IMPLEMENT(name, digest_size, block_size, \
this_cra_name, this_cra_driver_name, \ this_cra_name, this_cra_driver_name, \
init_f, update_f, final_f, \ init_f, update_f, final_f, \
test_routine) \ free_f, test_routine) \
\ \
\ \
static int km_ ## name ## _init(struct shash_desc *desc) { \ static int km_ ## name ## _init(struct shash_desc *desc) { \
@@ -537,6 +543,7 @@ static int km_ ## name ## _update(struct shash_desc *desc, const u8 *data, \
if (ret == 0) \ if (ret == 0) \
return 0; \ return 0; \
else { \ else { \
free_f(ctx-> name ## _state); \
km_sha3_free_tstate(ctx); \ km_sha3_free_tstate(ctx); \
return -EINVAL; \ return -EINVAL; \
} \ } \
@@ -547,6 +554,7 @@ static int km_ ## name ## _final(struct shash_desc *desc, u8 *out) { \
\ \
int ret = final_f(ctx-> name ## _state, out); \ int ret = final_f(ctx-> name ## _state, out); \
\ \
free_f(ctx-> name ## _state); \
km_sha3_free_tstate(ctx); \ km_sha3_free_tstate(ctx); \
if (ret == 0) \ if (ret == 0) \
return 0; \ return 0; \
@@ -561,8 +569,10 @@ static int km_ ## name ## _finup(struct shash_desc *desc, const u8 *data, \
\ \
int ret = update_f(ctx-> name ## _state, data, len); \ int ret = update_f(ctx-> name ## _state, data, len); \
\ \
if (ret != 0) \ if (ret != 0) { \
free_f(ctx-> name ## _state); \
return -EINVAL; \ return -EINVAL; \
} \
\ \
return km_ ## name ## _final(desc, out); \ return km_ ## name ## _final(desc, out); \
} \ } \
@@ -613,63 +623,63 @@ struct wc_swallow_the_semicolon
WC_LINUXKM_SHA_IMPLEMENT(sha1, WC_SHA_DIGEST_SIZE, WC_SHA_BLOCK_SIZE, WC_LINUXKM_SHA_IMPLEMENT(sha1, WC_SHA_DIGEST_SIZE, WC_SHA_BLOCK_SIZE,
WOLFKM_SHA1_NAME, WOLFKM_SHA1_DRIVER, WOLFKM_SHA1_NAME, WOLFKM_SHA1_DRIVER,
wc_InitSha, wc_ShaUpdate, wc_ShaFinal, wc_InitSha, wc_ShaUpdate, wc_ShaFinal,
sha_test); wc_ShaFree, sha_test);
#endif #endif
#ifdef LINUXKM_LKCAPI_REGISTER_SHA2_224 #ifdef LINUXKM_LKCAPI_REGISTER_SHA2_224
WC_LINUXKM_SHA_IMPLEMENT(sha2_224, WC_SHA224_DIGEST_SIZE, WC_SHA224_BLOCK_SIZE, WC_LINUXKM_SHA_IMPLEMENT(sha2_224, WC_SHA224_DIGEST_SIZE, WC_SHA224_BLOCK_SIZE,
WOLFKM_SHA2_224_NAME, WOLFKM_SHA2_224_DRIVER, WOLFKM_SHA2_224_NAME, WOLFKM_SHA2_224_DRIVER,
wc_InitSha224, wc_Sha224Update, wc_Sha224Final, wc_InitSha224, wc_Sha224Update, wc_Sha224Final,
sha224_test); wc_Sha224Free, sha224_test);
#endif #endif
#ifdef LINUXKM_LKCAPI_REGISTER_SHA2_256 #ifdef LINUXKM_LKCAPI_REGISTER_SHA2_256
WC_LINUXKM_SHA_IMPLEMENT(sha2_256, WC_SHA256_DIGEST_SIZE, WC_SHA256_BLOCK_SIZE, WC_LINUXKM_SHA_IMPLEMENT(sha2_256, WC_SHA256_DIGEST_SIZE, WC_SHA256_BLOCK_SIZE,
WOLFKM_SHA2_256_NAME, WOLFKM_SHA2_256_DRIVER, WOLFKM_SHA2_256_NAME, WOLFKM_SHA2_256_DRIVER,
wc_InitSha256, wc_Sha256Update, wc_Sha256Final, wc_InitSha256, wc_Sha256Update, wc_Sha256Final,
sha256_test); wc_Sha256Free, sha256_test);
#endif #endif
#ifdef LINUXKM_LKCAPI_REGISTER_SHA2_384 #ifdef LINUXKM_LKCAPI_REGISTER_SHA2_384
WC_LINUXKM_SHA_IMPLEMENT(sha2_384, WC_SHA384_DIGEST_SIZE, WC_SHA384_BLOCK_SIZE, WC_LINUXKM_SHA_IMPLEMENT(sha2_384, WC_SHA384_DIGEST_SIZE, WC_SHA384_BLOCK_SIZE,
WOLFKM_SHA2_384_NAME, WOLFKM_SHA2_384_DRIVER, WOLFKM_SHA2_384_NAME, WOLFKM_SHA2_384_DRIVER,
wc_InitSha384, wc_Sha384Update, wc_Sha384Final, wc_InitSha384, wc_Sha384Update, wc_Sha384Final,
sha384_test); wc_Sha384Free, sha384_test);
#endif #endif
#ifdef LINUXKM_LKCAPI_REGISTER_SHA2_512 #ifdef LINUXKM_LKCAPI_REGISTER_SHA2_512
WC_LINUXKM_SHA_IMPLEMENT(sha2_512, WC_SHA512_DIGEST_SIZE, WC_SHA512_BLOCK_SIZE, WC_LINUXKM_SHA_IMPLEMENT(sha2_512, WC_SHA512_DIGEST_SIZE, WC_SHA512_BLOCK_SIZE,
WOLFKM_SHA2_512_NAME, WOLFKM_SHA2_512_DRIVER, WOLFKM_SHA2_512_NAME, WOLFKM_SHA2_512_DRIVER,
wc_InitSha512, wc_Sha512Update, wc_Sha512Final, wc_InitSha512, wc_Sha512Update, wc_Sha512Final,
sha512_test); wc_Sha512Free, sha512_test);
#endif #endif
#ifdef LINUXKM_LKCAPI_REGISTER_SHA3_224 #ifdef LINUXKM_LKCAPI_REGISTER_SHA3_224
WC_LINUXKM_SHA3_IMPLEMENT(sha3_224, WC_SHA3_224_DIGEST_SIZE, WC_SHA3_224_BLOCK_SIZE, WC_LINUXKM_SHA3_IMPLEMENT(sha3_224, WC_SHA3_224_DIGEST_SIZE, WC_SHA3_224_BLOCK_SIZE,
WOLFKM_SHA3_224_NAME, WOLFKM_SHA3_224_DRIVER, WOLFKM_SHA3_224_NAME, WOLFKM_SHA3_224_DRIVER,
wc_InitSha3_224, wc_Sha3_224_Update, wc_Sha3_224_Final, wc_InitSha3_224, wc_Sha3_224_Update, wc_Sha3_224_Final,
sha3_test_once); wc_Sha3_224_Free, sha3_test_once);
#endif #endif
#ifdef LINUXKM_LKCAPI_REGISTER_SHA3_256 #ifdef LINUXKM_LKCAPI_REGISTER_SHA3_256
WC_LINUXKM_SHA3_IMPLEMENT(sha3_256, WC_SHA3_256_DIGEST_SIZE, WC_SHA3_256_BLOCK_SIZE, WC_LINUXKM_SHA3_IMPLEMENT(sha3_256, WC_SHA3_256_DIGEST_SIZE, WC_SHA3_256_BLOCK_SIZE,
WOLFKM_SHA3_256_NAME, WOLFKM_SHA3_256_DRIVER, WOLFKM_SHA3_256_NAME, WOLFKM_SHA3_256_DRIVER,
wc_InitSha3_256, wc_Sha3_256_Update, wc_Sha3_256_Final, wc_InitSha3_256, wc_Sha3_256_Update, wc_Sha3_256_Final,
sha3_test_once); wc_Sha3_256_Free, sha3_test_once);
#endif #endif
#ifdef LINUXKM_LKCAPI_REGISTER_SHA3_384 #ifdef LINUXKM_LKCAPI_REGISTER_SHA3_384
WC_LINUXKM_SHA3_IMPLEMENT(sha3_384, WC_SHA3_384_DIGEST_SIZE, WC_SHA3_384_BLOCK_SIZE, WC_LINUXKM_SHA3_IMPLEMENT(sha3_384, WC_SHA3_384_DIGEST_SIZE, WC_SHA3_384_BLOCK_SIZE,
WOLFKM_SHA3_384_NAME, WOLFKM_SHA3_384_DRIVER, WOLFKM_SHA3_384_NAME, WOLFKM_SHA3_384_DRIVER,
wc_InitSha3_384, wc_Sha3_384_Update, wc_Sha3_384_Final, wc_InitSha3_384, wc_Sha3_384_Update, wc_Sha3_384_Final,
sha3_test_once); wc_Sha3_384_Free, sha3_test_once);
#endif #endif
#ifdef LINUXKM_LKCAPI_REGISTER_SHA3_512 #ifdef LINUXKM_LKCAPI_REGISTER_SHA3_512
WC_LINUXKM_SHA3_IMPLEMENT(sha3_512, WC_SHA3_512_DIGEST_SIZE, WC_SHA3_512_BLOCK_SIZE, WC_LINUXKM_SHA3_IMPLEMENT(sha3_512, WC_SHA3_512_DIGEST_SIZE, WC_SHA3_512_BLOCK_SIZE,
WOLFKM_SHA3_512_NAME, WOLFKM_SHA3_512_DRIVER, WOLFKM_SHA3_512_NAME, WOLFKM_SHA3_512_DRIVER,
wc_InitSha3_512, wc_Sha3_512_Update, wc_Sha3_512_Final, wc_InitSha3_512, wc_Sha3_512_Update, wc_Sha3_512_Final,
sha3_test_once); wc_Sha3_512_Free, sha3_test_once);
#endif #endif
struct km_sha_hmac_pstate { struct km_sha_hmac_pstate {
@@ -700,6 +710,7 @@ WC_MAYBE_UNUSED static int linuxkm_hmac_setkey_common(struct crypto_shash *tfm,
} }
WC_MAYBE_UNUSED static void km_hmac_free_tstate(struct km_sha_hmac_state *t_ctx) { WC_MAYBE_UNUSED static void km_hmac_free_tstate(struct km_sha_hmac_state *t_ctx) {
wc_HmacFree(t_ctx->wc_hmac);
free(t_ctx->wc_hmac); free(t_ctx->wc_hmac);
t_ctx->wc_hmac = NULL; t_ctx->wc_hmac = NULL;
} }
@@ -731,6 +742,33 @@ WC_MAYBE_UNUSED static int km_hmac_init(struct shash_desc *desc) {
XMEMCPY(t_ctx->wc_hmac, &p_ctx->wc_hmac, sizeof *t_ctx->wc_hmac); XMEMCPY(t_ctx->wc_hmac, &p_ctx->wc_hmac, sizeof *t_ctx->wc_hmac);
#ifdef WOLFSSL_SMALL_STACK_CACHE
/* The cached W buffer from the persistent ctx can't be used because it
* would be double-freed, first by km_hmac_free_tstate(), then by
* km_hmac_exit_tfm().
*/
switch (t_ctx->wc_hmac->macType) {
#ifndef NO_SHA256
case WC_SHA256:
#ifdef WOLFSSL_SHA224
case WC_SHA224:
#endif
t_ctx->wc_hmac->hash.sha256.W = NULL;
break;
#endif /* WOLFSSL_SHA256 */
#ifdef WOLFSSL_SHA512
case WC_SHA512:
#ifdef WOLFSSL_SHA384
case WC_SHA384:
#endif
t_ctx->wc_hmac->hash.sha512.W = NULL;
break;
#endif /* WOLFSSL_SHA512 */
}
#endif /* WOLFSSL_SMALL_STACK_CACHE */
return 0; return 0;
} }