From: Thomas Gummerer <t.gummerer@gmail.com>
To: Kevin Willford <kewillf@microsoft.com>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] read-cache: fix index corruption with index v4
Date: Wed, 6 Sep 2017 21:06:16 +0100 [thread overview]
Message-ID: <CALgYhfNYgmCJqptNQLKaQpCs9mAgqZHUrDS3BVEqCv_f+WX-qg@mail.gmail.com> (raw)
In-Reply-To: <SN1PR21MB001457E4DD1AE17D041C6C77B7960@SN1PR21MB0014.namprd21.prod.outlook.com>
On Tue, Sep 5, 2017 at 8:37 PM, Kevin Willford <kewillf@microsoft.com> wrote:
>> From: Thomas Gummerer [mailto:t.gummerer@gmail.com]
>> Sent: Monday, September 4, 2017 4:58 PM
[..]
>> I unfortunately didn't have more time to dig so
>>
>> > As ce->name is however not nul terminated
>>
>> just comes from my memory and from the patch below actually fixing the
>> corruption, so it's really the most likely cause. Would be great if
>> someone who can remember more about the index could confirm that this
>> is indeed the case.
>>
>
> Digging into this and ce->name IS nul terminated. The issue comes in when
> the CE_STRIP_NAME is set, which is only set when using a split index.
> This sets the ce->ce_namelen = 0 without changing the actual ce->name buffer.
> When writing the entry for the split index version 4 it was using the first character
> in the ce->name buffer because of the + 1, which obviously isn't correct. Before
> it was using a newly allocated name buffer from the ondisk struct which was
> allocated based on the ce_namelen of zero.
Thank you very much for digging into this. That also explains why
only t1700 was
affected, but none of the other tests. Will update the commit message.
>> read-cache.c | 4 +++-
>> 1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/read-cache.c b/read-cache.c
>> index 40da87ea71..80830ddcfc 100644
>> --- a/read-cache.c
>> +++ b/read-cache.c
>> @@ -2103,7 +2103,9 @@ static int ce_write_entry(git_SHA_CTX *c, int fd, struct
>> cache_entry *ce,
>> if (!result)
>> result = ce_write(c, fd, to_remove_vi, prefix_size);
>> if (!result)
>> - result = ce_write(c, fd, ce->name + common,
>> ce_namelen(ce) - common + 1);
>> + result = ce_write(c, fd, ce->name + common,
>> ce_namelen(ce) - common);
>> + if (!result)
>> + result = ce_write(c, fd, "\0", 1);
>
> You could use the padding variable here as well which is used in the < version 4
> ce_write.
Thanks, will do that.
>>
>> strbuf_splice(previous_name, common, to_remove,
>> ce->name + common, ce_namelen(ce) - common);
>> --
>> 2.14.1.480.gb18f417b89
>
> While looking at the code I was wondering if we could get around the
> whole setting ce->ce_namelen to zero bit but that would be much bigger
> patch and possibly introduce other bugs so this seems the appropriate
> fix for now.
>
> Thanks for finding this!
Thanks for the review! Will send an updated patch in a bit.
> Kevin
next prev parent reply other threads:[~2017-09-06 20:06 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-04 22:58 [PATCH] read-cache: fix index corruption with index v4 Thomas Gummerer
2017-09-05 19:37 ` Kevin Willford
2017-09-06 20:06 ` Thomas Gummerer [this message]
2017-09-07 19:24 ` [PATCH v2] " Thomas Gummerer
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=CALgYhfNYgmCJqptNQLKaQpCs9mAgqZHUrDS3BVEqCv_f+WX-qg@mail.gmail.com \
--to=t.gummerer@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kewillf@microsoft.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.
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).