database/openGauss-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!6430 修复memcheck内存泄漏问题

Browse Source 
Merge pull request !6430 from lukeman/master
This commit is contained in:
opengauss_bot
2024-09-25 09:54:00 +00:00
committed by Gitee
parent b78d3cea15 dad382dc0e
commit c437e73442
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gausskernel/security/keymgr/localkms/security_file_enc.cpp
View File

@ -219,7 +219,7 @@ CmkemErrCode encrypt_and_write_key(const char *key_file_path, CmkemUStr *key_pla
unsigned char salt[KEY_METERIAL_LEN] = {0};
unsigned char iv_salt_buf[sizeof(iv) + sizeof(salt)] = {0};
unsigned char derived_key[DRIVED_KEY_LEN] = {0};
unsigned char tmp_cipher[RSA2048_KEN_LEN] = {0};
unsigned char tmp_cipher[RSA3072_KEN_LEN] = {0};
int tmp_cipher_len = 0;
char rand_file_path[PATH_MAX] = {0};
errno_t rc = 0;

12
src/gausskernel/security/keymgr/localkms/security_localkms.cpp
View File

@ -541,6 +541,7 @@ KmUnStr kms_mk_decrypt(KeyMgr *kmgr, KeyInfo info, KmUnStr cipher)
LocalKmsMgr *kms = (LocalKmsMgr *)(void *)kmgr;
CmkemErrCode ret = CMKEM_UNKNOWN_ERR;
KmUnStr plain = {0};
errno_t rc = EOK;
CmkemUStr _cipher = {cipher.val, cipher.len};
CmkemUStr *_plain = NULL;
@ -562,8 +563,17 @@ KmUnStr kms_mk_decrypt(KeyMgr *kmgr, KeyInfo info, KmUnStr cipher)
return plain;
}
plain.val = _plain->ustr_val;
size_t ustrLen = _cipher.ustr_len * 2;
plain.val = (unsigned char *)km_alloc_zero(ustrLen);
if (plain.val == NULL) {
km_safe_free(_plain);
km_err_msg(kms->kmgr.err, "%s", get_cmkem_errmsg(CMKEM_MALLOC_MEM_ERR));
return plain;
}
rc = memcpy_s(plain.val, ustrLen, _plain->ustr_val, ustrLen);
km_securec_check(rc, "\0", "\0");
plain.len = _plain->ustr_len;
free_cmkem_ustr_with_erase(_plain);
return plain;
}