root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fix Memory leak in CMS_EncryptedData_set1_key 

When CMS_EncryptedData_set1_key is called repeatedly it will
leak data on the second call. This was because
cms->d.encryptedData was already set and needed to be cleared
before the call to M_ASN1_new_of.

Fixes: #28606

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/28668)
This commit is contained in:
Ryan Hooper 2025-09-25 12:42:24 -04:00 committed by Tomas Mraz
parent 26e2c9c150
commit 7de825efa2
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/cms/cms_enc.c
View File

@ -229,6 +229,10 @@ int CMS_EncryptedData_set1_key(CMS_ContentInfo *cms, const EVP_CIPHER *ciph,
return 0; return 0;
} }
if (ciph) { if (ciph) {
if (cms->d.encryptedData != NULL) {
M_ASN1_free_of(cms->d.encryptedData, CMS_EncryptedData);
cms->d.encryptedData = NULL;
}
cms->d.encryptedData = M_ASN1_new_of(CMS_EncryptedData); cms->d.encryptedData = M_ASN1_new_of(CMS_EncryptedData);
if (!cms->d.encryptedData) { if (!cms->d.encryptedData) {
ERR_raise(ERR_LIB_CMS, ERR_R_ASN1_LIB); ERR_raise(ERR_LIB_CMS, ERR_R_ASN1_LIB);

24
test/cmsapitest.c
View File

@ -385,6 +385,29 @@ end:
return ret; return ret;
} }
static int test_CMS_set1_key_mem_leak(void)
{
CMS_ContentInfo *cms;
unsigned char key[32] = {0};
int ret = 0;
if (!TEST_ptr(cms = CMS_ContentInfo_new()))
return 0;
if (!TEST_true(CMS_EncryptedData_set1_key(cms, EVP_aes_256_cbc(),
key, 32)))
goto end;
if (!TEST_true(CMS_EncryptedData_set1_key(cms, EVP_aes_128_cbc(),
key, 16)))
goto end;
ret = 1;
end:
CMS_ContentInfo_free(cms);
return ret;
}
OPT_TEST_DECLARE_USAGE("certfile privkeyfile derfile\n") OPT_TEST_DECLARE_USAGE("certfile privkeyfile derfile\n")
int setup_tests(void) int setup_tests(void)
@ -431,6 +454,7 @@ int setup_tests(void)
ADD_TEST(test_encrypt_decrypt_aes_256_gcm); ADD_TEST(test_encrypt_decrypt_aes_256_gcm);
ADD_TEST(test_CMS_add1_cert); ADD_TEST(test_CMS_add1_cert);
ADD_TEST(test_d2i_CMS_bio_NULL); ADD_TEST(test_d2i_CMS_bio_NULL);
ADD_TEST(test_CMS_set1_key_mem_leak);
ADD_ALL_TESTS(test_d2i_CMS_decode, 2); ADD_ALL_TESTS(test_d2i_CMS_decode, 2);
return 1; return 1;
} }