From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Cc: Fabian Stelzer <fs@gigacodes.de>
Subject: [PATCH 2/2] gpg-interface: fix leak of strbufs in get_ssh_key_fingerprint()
Date: Mon, 18 Oct 2021 13:15:37 -0400 [thread overview]
Message-ID: <YW2ruTL2XReEeIAh@coredump.intra.peff.net> (raw)
In-Reply-To: <YW2qpuosxr9PNwVa@coredump.intra.peff.net>
We read stdout from gpg into a strbuf, then split it into a list of
strbufs, pull out one element, and return it. But we don't free either
the original stdout buffer, nor the list returned from strbuf_split().
This patch fixes both. Note that we have to detach the returned string
from its strbuf before calling strbuf_list_free(), as that would
otherwise throw it away.
Signed-off-by: Jeff King <peff@peff.net>
---
gpg-interface.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/gpg-interface.c b/gpg-interface.c
index c60b9cd19d..800d8caa67 100644
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@ -711,6 +711,7 @@ static char *get_ssh_key_fingerprint(const char *signing_key)
int ret = -1;
struct strbuf fingerprint_stdout = STRBUF_INIT;
struct strbuf **fingerprint;
+ char *fingerprint_ret;
/*
* With SSH Signing this can contain a filename or a public key
@@ -737,7 +738,10 @@ static char *get_ssh_key_fingerprint(const char *signing_key)
die_errno(_("failed to get the ssh fingerprint for key '%s'"),
signing_key);
- return strbuf_detach(fingerprint[1], NULL);
+ fingerprint_ret = strbuf_detach(fingerprint[1], NULL);
+ strbuf_list_free(fingerprint);
+ strbuf_release(&fingerprint_stdout);
+ return fingerprint_ret;
}
/* Returns the first public key from an ssh-agent to use for signing */
--
2.33.1.1223.g80c1dbe6e5
next prev parent reply other threads:[~2021-10-18 17:15 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-18 17:11 [PATCH 0/2] some leak fixes on fs/ssh-signing-fix Jeff King
2021-10-18 17:15 ` [PATCH 1/2] gpg-interface: fix leak of "line" in parse_ssh_output() Jeff King
2021-10-18 17:15 ` Jeff King [this message]
2021-10-19 8:16 ` [PATCH 0/2] some leak fixes on fs/ssh-signing-fix Fabian Stelzer
2021-10-19 21:01 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YW2ruTL2XReEeIAh@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=fs@gigacodes.de \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).