security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

agent: Fix a bug accessing after release when opt.verbose. 

* agent/command-ssh.c (ssh_handler_request_identities): Don't release
KEY_PUBLIC too early.

--

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2022-05-20 15:51:47 +09:00
parent ef3e5fd403
commit 1b0c4c2778
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
agent/command-ssh.c
View File

@ -2511,7 +2511,6 @@ ssh_handler_request_identities (ctrl_t ctrl,
{ {
u32 key_counter; u32 key_counter;
estream_t key_blobs; estream_t key_blobs;
gcry_sexp_t key_public;
gpg_error_t err; gpg_error_t err;
int ret; int ret;
gpg_error_t ret_err; gpg_error_t ret_err;
@ -2520,7 +2519,6 @@ ssh_handler_request_identities (ctrl_t ctrl,
/* Prepare buffer stream. */ /* Prepare buffer stream. */
key_public = NULL;
key_counter = 0; key_counter = 0;
key_blobs = es_fopenmem (0, "r+b"); key_blobs = es_fopenmem (0, "r+b");
@ -2560,13 +2558,12 @@ ssh_handler_request_identities (ctrl_t ctrl,
for (keyinfo = keyinfo_list; keyinfo; keyinfo = keyinfo->next) for (keyinfo = keyinfo_list; keyinfo; keyinfo = keyinfo->next)
{ {
char *cardsn; char *cardsn;
gcry_sexp_t key_public = NULL;
if (card_key_available (ctrl, keyinfo, &key_public, &cardsn)) if (card_key_available (ctrl, keyinfo, &key_public, &cardsn))
continue; continue;
err = ssh_send_key_public (key_blobs, key_public, cardsn); err = ssh_send_key_public (key_blobs, key_public, cardsn);
gcry_sexp_release (key_public);
key_public = NULL;
xfree (cardsn); xfree (cardsn);
if (err) if (err)
{ {
@ -2582,11 +2579,14 @@ ssh_handler_request_identities (ctrl_t ctrl,
else else
{ {
agent_card_free_keyinfo (keyinfo_list); agent_card_free_keyinfo (keyinfo_list);
gcry_sexp_release (key_public);
goto out; goto out;
} }
} }
else else
key_counter++; key_counter++;
gcry_sexp_release (key_public);
} }
agent_card_free_keyinfo (keyinfo_list); agent_card_free_keyinfo (keyinfo_list);