From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Andrew Olsen <andrew.olsen@koordinates.com>,
Jonathan Tan <jonathantanmy@google.com>,
git@vger.kernel.org
Subject: Re: [PATCH] is_promisor_object(): fix use-after-free of tree buffer
Date: Mon, 15 Aug 2022 18:53:13 -0400 [thread overview]
Message-ID: <YvrOWY2x19G1jCTK@coredump.intra.peff.net> (raw)
In-Reply-To: <xmqqmtc63wdf.fsf@gitster.g>
On Sun, Aug 14, 2022 at 10:32:12PM -0700, Junio C Hamano wrote:
> > We're in the middle of walking through the entries of a tree object via
> > process_tree_contents(). We see a blob (or it could even be another tree
> > entry) that we don't have, so we call is_promisor_object() to check it.
> > That function loops over all of the objects in the promisor packfile,
> > including the tree we're currently walking.
>
> I forgot that the above "loops over" happens only once to populate
> the oidset hashtable, and briefly wondered if we are being grossly
> inefficient by scanning pack .idx file each time we encounter a
> missing object. "Upon first call, that function loops over
> ... walking, to prepare a hashtable to answer if any object id is
> referred to by an object in promisor packs" would have helped ;-).
Right. When you have worked in an area, sometimes it is easy to forget
which things are common knowledge and which are not. :) I don't mind at
all if you want to amend the commit message as you apply.
> > It may also be a good direction for this function in general, as there
> > are other possible optimizations that rely on doing some analysis before
> > parsing:
> >
> > - we could detect blobs and avoid reading their contents; they can't
> > link to other objects, but parse_object() doesn't know that we don't
> > care about checking their hashes.
> >
> > - we could avoid allocating object structs entirely for most objects
> > (since we really only need them in the oidset), which would save
> > some memory.
> >
> > - promisor commits could use the commit-graph rather than loading the
> > object from disk
> >
> > This commit doesn't do any of those optimizations, but I think it argues
> > that this direction is reasonable, rather than relying on parse_object()
> > and trying to teach it to give us more information about whether it
> > parsed.
>
> Yeah, all of the future bits sound sensible.
I very intentionally didn't work on those things yet, because I wanted
to make sure we got a simple fix in as quickly as possible. That said, I
don't have immediate plans for them. They are perhaps not quite small
enough for #leftoverbits, but I think they might also be nice bite-sized
chunks for somebody wanting to get their feet wet in that part of the
code.
-Peff
prev parent reply other threads:[~2022-08-16 2:35 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-10 21:33 [BUG] git rev-list --missing=allow-promisor Andrew Olsen
2022-08-11 8:12 ` Jeff King
2022-08-14 6:29 ` [PATCH] is_promisor_object(): fix use-after-free of tree buffer Jeff King
2022-08-15 5:32 ` Junio C Hamano
2022-08-15 22:53 ` Jeff King [this message]
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=YvrOWY2x19G1jCTK@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=andrew.olsen@koordinates.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jonathantanmy@google.com \
/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).