From: Jeff King <peff@peff.net>
To: Mike Hommey <mh@glandium.org>
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH] notes: avoid leaking duplicate entries
Date: Sun, 25 Aug 2019 03:10:35 -0400 [thread overview]
Message-ID: <20190825071035.GB23806@sigill.intra.peff.net> (raw)
In-Reply-To: <20190825051818.9621-1-mh@glandium.org>
On Sun, Aug 25, 2019 at 02:18:18PM +0900, Mike Hommey wrote:
> When add_note is called multiple times with the same key/value pair, the
> leaf_node it creates is leaked by notes_tree_insert.
Makes sense.
> diff --git a/notes.c b/notes.c
> index 75c028b300..ec35f5b551 100644
> --- a/notes.c
> +++ b/notes.c
> @@ -269,8 +269,10 @@ static int note_tree_insert(struct notes_tree *t, struct int_node *tree,
> case PTR_TYPE_NOTE:
> if (oideq(&l->key_oid, &entry->key_oid)) {
> /* skip concatenation if l == entry */
> - if (oideq(&l->val_oid, &entry->val_oid))
> + if (oideq(&l->val_oid, &entry->val_oid)) {
> + free(entry);
> return 0;
> + }
"entry" is passed in by the caller. Does anybody try to insert, and then
after the insertion continue to access the entry?
The only case I could find is this one in load_subtree():
if (note_tree_insert(t, node, n, l, type,
combine_notes_concatenate))
die("Failed to load %s %s into notes tree "
"from %s",
type == PTR_TYPE_NOTE ? "note" : "subtree",
oid_to_hex(&l->key_oid), t->ref);
If we fail to insert, we'll try to access the key_oid of the entry we
passed in, which might have been freed. But your patch is OK, because it
only touches a code path where we always return success.
Curiously, I think the existing case a few lines below your patch is
wrong, though:
ret = combine_notes(&l->val_oid,
&entry->val_oid);
if (!ret && is_null_oid(&l->val_oid))
note_tree_remove(t, tree, n, entry);
free(entry);
return ret;
If combining the notes fails, we'll free the entry and return an error
code, and then load_subtree() will access the freed memory. I think we
could just object_oid instead.
-Peff
next prev parent reply other threads:[~2019-08-25 7:10 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-25 5:18 [PATCH] notes: avoid leaking duplicate entries Mike Hommey
2019-08-25 7:10 ` Jeff King [this message]
2019-08-25 7:19 ` [PATCH] notes: avoid potential use-after-free during insertion Jeff King
2019-08-26 1:55 ` [PATCH] notes: avoid leaking duplicate entries Mike Hommey
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190825071035.GB23806@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mh@glandium.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).