security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-02 12:01:32 +01:00
Code Activity

agent:kem: Fix memory leaks.

Browse Source 
* agent/pkdecrypt.c (composite_pgp_kem_decrypt): Release shadow_info
memory.

--

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2024-04-25 13:51:47 +09:00
parent 2593dcbceb
commit 02b056ef77
No known key found for this signature in database
GPG Key ID: 640114AF89DE6054
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
agent/pkdecrypt.c
View File

@ -408,7 +408,8 @@ composite_pgp_kem_decrypt (ctrl_t ctrl, const char *desc_text,
{ {
gcry_sexp_t s_skey0 = NULL; gcry_sexp_t s_skey0 = NULL;
gcry_sexp_t s_skey1 = NULL; gcry_sexp_t s_skey1 = NULL;
unsigned char *shadow_info = NULL; unsigned char *shadow_info0 = NULL;
unsigned char *shadow_info1 = NULL;
gpg_error_t err = 0; gpg_error_t err = 0;
unsigned int nbits; unsigned int nbits;
@ -444,7 +445,7 @@ composite_pgp_kem_decrypt (ctrl_t ctrl, const char *desc_text,
gcry_buffer_t fixed_info = { 0, 0, 0, NULL }; gcry_buffer_t fixed_info = { 0, 0, 0, NULL };
err = agent_key_from_file (ctrl, NULL, desc_text, err = agent_key_from_file (ctrl, NULL, desc_text,
ctrl->keygrip, &shadow_info, ctrl->keygrip, &shadow_info0,
CACHE_MODE_NORMAL, NULL, &s_skey0, NULL, NULL); CACHE_MODE_NORMAL, NULL, &s_skey0, NULL, NULL);
if (err) if (err)
{ {
@ -453,7 +454,7 @@ composite_pgp_kem_decrypt (ctrl_t ctrl, const char *desc_text,
} }
err = agent_key_from_file (ctrl, NULL, desc_text, err = agent_key_from_file (ctrl, NULL, desc_text,
ctrl->keygrip1, &shadow_info, ctrl->keygrip1, &shadow_info1,
CACHE_MODE_NORMAL, NULL, &s_skey1, NULL, NULL); CACHE_MODE_NORMAL, NULL, &s_skey1, NULL, NULL);
if (err) if (err)
{ {
@ -620,6 +621,8 @@ composite_pgp_kem_decrypt (ctrl_t ctrl, const char *desc_text,
gcry_free (fixed_info.data); gcry_free (fixed_info.data);
gcry_sexp_release (s_skey0); gcry_sexp_release (s_skey0);
gcry_sexp_release (s_skey1); gcry_sexp_release (s_skey1);
xfree (shadow_info0);
xfree (shadow_info1);
return err; return err;
} }