refs/files: detect race when generating reflog entry for HEAD

When updating a reference that is being pointed to HEAD we don't only
write a reflog message for that particular reference, but also generate
one for HEAD. This logic is handled by `split_head_update()`, where we:

  1. Verify that the condition actually triggered. This is done by
     reading HEAD at the start of the transaction so that we can then
     check whether a given reference update refers to its target.

  2. Queue a new log-only update for HEAD in case it did.

But the logic is unfortunately not free of races, as we do not lock the
HEAD reference after we have read its target. This can lead to the
following two scenarios:

  - HEAD gets concurrently updated to point to one of the references we
    have already processed. This causes us not writing a reflog message
    even though we should have done so.

  - HEAD gets concurrently updated to no longer point to a reference
    anymore that we have already processed. This causes us to write a
    reflog message even though we should _not_ have done so.

Improve the situation by introducing a new `REF_LOG_VIA_SPLIT` flag that
is specific to the "files" backend. If set, we will double check that
the HEAD reference still points to the reference that we are creating
the reflog entry for after we have locked HEAD. Furthermore, instead of
manually resolving the old object ID of that entry, we now use the same
old state as for the parent update.

If we detect such a racy update we abort the transaction. This is a bit
heavy-handed: the user didn't even ask us to write a reflog update for
"HEAD", so it might be surprising if we abort the transaction. That
being said:

  - Normal users wouldn't typically hit this case as we only hit the
    relevant code when committing to a branch that is being pointed to
    by "HEAD" directly. Commands like git-commit(1) typically commit to
    "HEAD" itself though.

  - Scripted users that use git-update-ref(1) and related plumbing
    commands are unlikely to hit this case either, as they would have to
    update the pointed-to-branch at the same as "HEAD" is being updated,
    which is an exceedingly rare event.

The alternative would be to instead drop the log-only update completely,
but that would require more logic that is hard to verify without adding
infrastructure specific for such a test. So we rather do the pragmatic
thing and don't worry too much about an edge case that is very unlikely
to happen.

Unfortunately, this change only helps with the second race. We cannot
reliably plug the first race without locking the HEAD reference at the
start of the transaction. Locking HEAD unconditionally would effectively
serialize all writes though, and that doesn't seem like an option. Also,
double checking its value at the end of the transaction is not an option
either, as its target may have flip-flopped during the transaction.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/refs/files-backend.c b/refs/files-backend.c
index bf6f89b1d1938b6fae0c4125839c188b0d65fc86..ba018b0984a8a35daf972420d2c83209662ce0fd 100644 (file)
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -68,6 +68,12 @@
  */
 #define REF_DELETED_RMDIR (1 << 9)
 
+/*
+ * Used to indicate that the reflog-only update has been created via
+ * `split_head_update()`.
+ */
+#define REF_LOG_VIA_SPLIT (1 << 14)
+
 struct ref_lock {
        char *ref_name;
        struct lock_file lk;
@@ -2420,9 +2426,10 @@ static enum ref_transaction_error split_head_update(struct ref_update *update,
 
        new_update = ref_transaction_add_update(
                        transaction, "HEAD",
-                       update->flags | REF_LOG_ONLY | REF_NO_DEREF,
+                       update->flags | REF_LOG_ONLY | REF_NO_DEREF | REF_LOG_VIA_SPLIT,
                        &update->new_oid, &update->old_oid,
                        NULL, NULL, update->committer_info, update->msg);
+       new_update->parent_update = update;
 
        /*
         * Add "HEAD". This insertion is O(N) in the transaction
@@ -2600,7 +2607,36 @@ static enum ref_transaction_error lock_ref_for_update(struct files_ref_store *re
 
        update->backend_data = lock;
 
-       if (update->type & REF_ISSYMREF) {
+       if (update->flags & REF_LOG_VIA_SPLIT) {
+               struct ref_lock *parent_lock;
+
+               if (!update->parent_update)
+                       BUG("split update without a parent");
+
+               parent_lock = update->parent_update->backend_data;
+
+               /*
+                * Check that "HEAD" didn't racily change since we have looked
+                * it up. If it did we must refuse to write the reflog entry.
+                *
+                * Note that this does not catch all races: if "HEAD" was
+                * racily changed to point to one of the refs part of the
+                * transaction then we would miss writing the split reflog
+                * entry for "HEAD".
+                */
+               if (!(update->type & REF_ISSYMREF) ||
+                   strcmp(update->parent_update->refname, referent.buf)) {
+                       strbuf_addstr(err, "HEAD has been racily updated");
+                       ret = REF_TRANSACTION_ERROR_GENERIC;
+                       goto out;
+               }
+
+               if (update->flags & REF_HAVE_OLD) {
+                       oidcpy(&lock->old_oid, &update->old_oid);
+               } else {
+                       oidcpy(&lock->old_oid, &parent_lock->old_oid);
+               }
+       } else if (update->type & REF_ISSYMREF) {
                if (update->flags & REF_NO_DEREF) {
                        /*
                         * We won't be reading the referent as part of