From: Jeff King <peff@peff.net>
To: Mike Hommey <mh@glandium.org>
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: [PATCH] notes: avoid potential use-after-free during insertion
Date: Sun, 25 Aug 2019 03:19:51 -0400 [thread overview]
Message-ID: <20190825071951.GC23806@sigill.intra.peff.net> (raw)
In-Reply-To: <20190825071035.GB23806@sigill.intra.peff.net>
On Sun, Aug 25, 2019 at 03:10:35AM -0400, Jeff King wrote:
> 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.
Here's a patch. It's textually independent of yours, but I think it
makes sense to apply the two on a single branch.
No test, as I didn't bother to figure out what it takes to trigger the
error message, and the solution is (hopefully) an obvious improvement
even if it can't be triggered in practice.
-- >8 --
Subject: [PATCH] notes: avoid potential use-after-free during insertion
The note_tree_insert() function may free the leaf_node struct we pass in
(e.g., if it's a duplicate, or if it needs to be combined with an
existing note).
Most callers are happy with this, as they assume that ownership of the
struct is handed off. But in load_subtree(), if we see an error we'll
use the handed-off struct's key_oid to generate the die() message,
potentially accessing freed memory.
We can easily fix this by instead using the original oid that we copied
into the leaf_node struct.
Signed-off-by: Jeff King <peff@peff.net>
---
notes.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/notes.c b/notes.c
index 75c028b300..3477e8e554 100644
--- a/notes.c
+++ b/notes.c
@@ -453,17 +453,17 @@ static void load_subtree(struct notes_tree *t, struct leaf_node *subtree,
l = xcalloc(1, sizeof(*l));
oidcpy(&l->key_oid, &object_oid);
oidcpy(&l->val_oid, &entry.oid);
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);
+ oid_to_hex(&object_oid), t->ref);
continue;
handle_non_note:
/*
* Determine full path for this non-note entry. The
* filename is already found in entry.path, but the
* directory part of the path must be deduced from the
--
2.23.0.478.g23872bed7d
next prev parent reply other threads:[~2019-08-25 7:19 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
2019-08-25 7:19 ` Jeff King [this message]
2019-08-26 1:55 ` 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=20190825071951.GC23806@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).