From: "Ben Lynn" <benlynn@gmail.com>
To: "Linus Torvalds" <torvalds@linux-foundation.org>,
"Daniel Barkalow" <barkalow@iabervon.org>
Cc: git@vger.kernel.org
Subject: Re: git bugs
Date: Tue, 10 Jun 2008 11:45:23 -0700 [thread overview]
Message-ID: <832adb090806101145w55729676ya7bcfb41b0413f59@mail.gmail.com> (raw)
In-Reply-To: <alpine.LFD.1.10.0806101028040.3101@woody.linux-foundation.org>
I hadn't thought of exploiting the fact that the SHA1 of an empty file
is fixed. Nice! I believe I can prove there are no races now.
Incidentally, this is how I first found the bug: I was trying to prove
what git did worked.
I still prefer a per-entry flag solution (I suspect it's faster, and
the proof is easier), but that's too much work.
-Ben
On Tue, Jun 10, 2008 at 10:44 AM, Linus Torvalds
<torvalds@linux-foundation.org> wrote:
>
>
> On Tue, 10 Jun 2008, Ben Lynn wrote:
>>
>> Unfortunately, the solution isn't perfect. Try this:
>
> Heh.
>
> That's just because our "smudge_racily_clean_entry()" uses 0 as the magic
> smudging size.
>
> You can fix this multiple ways. One would be to pick another size that is
> simply less likely (eg ~0 instead), which leaves the theoretical race, and
> just makes it practically impossible to hit (not that I think it's very
> practical to hit already).
>
> The other approach is to know that an empty blob always has a very
> specific SHA1. Here's an trial patch.
>
> Linus
>
> ---
> read-cache.c | 16 ++++++++++++++++
> 1 files changed, 16 insertions(+), 0 deletions(-)
>
> diff --git a/read-cache.c b/read-cache.c
> index 8e5fbb6..f83de8c 100644
> --- a/read-cache.c
> +++ b/read-cache.c
> @@ -138,6 +138,16 @@ static int ce_modified_check_fs(struct cache_entry *ce, struct stat *st)
> return 0;
> }
>
> +static int is_empty_blob_sha1(const unsigned char *sha1)
> +{
> + static const unsigned char empty_blob_sha1[20] = {
> + 0xe6,0x9d,0xe2,0x9b,0xb2,0xd1,0xd6,0x43,0x4b,0x8b,
> + 0x29,0xae,0x77,0x5a,0xd8,0xc2,0xe4,0x8c,0x53,0x91
> + };
> +
> + return !hashcmp(sha1, empty_blob_sha1);
> +}
> +
> static int ce_match_stat_basic(struct cache_entry *ce, struct stat *st)
> {
> unsigned int changed = 0;
> @@ -193,6 +203,12 @@ static int ce_match_stat_basic(struct cache_entry *ce, struct stat *st)
> if (ce->ce_size != (unsigned int) st->st_size)
> changed |= DATA_CHANGED;
>
> + /* Racily smudged entry? */
> + if (!ce->ce_size) {
> + if (!is_empty_blob_sha1(ce->sha1))
> + changed |= DATA_CHANGED;
> + }
> +
> return changed;
> }
>
>
next prev parent reply other threads:[~2008-06-10 18:46 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-10 8:41 git bugs Ben Lynn
2008-06-10 16:58 ` Daniel Barkalow
2008-06-10 17:44 ` Linus Torvalds
2008-06-10 18:45 ` Ben Lynn [this message]
2008-06-10 20:06 ` Linus Torvalds
2008-06-10 23:09 ` Ben Lynn
2008-06-10 23:38 ` Junio C Hamano
2008-06-11 0:02 ` Ben Lynn
2008-06-11 0:20 ` Junio C Hamano
2008-06-11 0:24 ` Ben Lynn
2008-06-11 0:53 ` Ben Lynn
2008-06-11 12:46 ` Stephen R. van den Berg
2008-06-12 6:51 ` Ben Lynn
2008-06-11 1:36 ` Linus Torvalds
2008-06-11 2:04 ` Ben Lynn
2008-06-11 2:12 ` Linus Torvalds
2008-06-11 2:31 ` Ben Lynn
2008-06-11 2:39 ` Linus Torvalds
2008-06-11 5:58 ` Ben Lynn
2008-06-11 6:18 ` Ben Lynn
2008-06-11 14:54 ` Linus Torvalds
2008-06-11 17:52 ` Ben Lynn
2008-06-11 18:10 ` Linus Torvalds
2008-06-11 18:48 ` Ben Lynn
2008-06-11 18:53 ` Linus Torvalds
2008-06-11 20:57 ` Ben Lynn
2008-06-11 21:50 ` Junio C Hamano
2008-06-11 14:52 ` Linus Torvalds
2008-06-12 20:06 ` Junio C Hamano
2008-06-13 10:10 ` Jeff King
2008-06-13 23:09 ` Junio C Hamano
2008-06-14 6:25 ` Jeff King
2008-06-12 3:17 ` Shawn O. Pearce
2008-06-12 6:46 ` Ben Lynn
2008-06-12 7:12 ` Johannes Schindelin
-- strict thread matches above, loose matches on Subject: below --
2017-02-23 20:27 Sean Hunt
2017-02-24 16:52 ` Johannes Schindelin
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=832adb090806101145w55729676ya7bcfb41b0413f59@mail.gmail.com \
--to=benlynn@gmail.com \
--cc=barkalow@iabervon.org \
--cc=git@vger.kernel.org \
--cc=torvalds@linux-foundation.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).