From: Ronnie Sahlberg <sahlberg@google.com>
To: git@vger.kernel.org
Cc: Ronnie Sahlberg <sahlberg@google.com>
Subject: [PATCH v14 35/40] refs.c: move the check for valid refname to lock_ref_sha1_basic
Date: Fri, 6 Jun 2014 15:29:13 -0700 [thread overview]
Message-ID: <1402093758-3162-36-git-send-email-sahlberg@google.com> (raw)
In-Reply-To: <1402093758-3162-1-git-send-email-sahlberg@google.com>
Move the check for check_refname_format from lock_any_ref_for_update
to lock_ref_sha1_basic. At some later stage we will get rid of
lock_any_ref_for_update completely.
If lock_ref_sha1_basic fails the check_refname_format test, set errno to
EINVAL before returning NULL. This to guarantee that we will not return an
error without updating errno.
This leaves lock_any_ref_for_updates as a no-op wrapper which could be removed.
But this wrapper is also called from an external caller and we will soon
make changes to the signature to lock_ref_sha1_basic that we do not want to
expose to that caller.
This changes semantics for lock_ref_sha1_basic slightly. With this change
it is no longer possible to open a ref that has a badly name which breaks
any codepaths that tries to open and repair badly named refs. The normal refs
API should not allow neither creating nor accessing refs with invalid names.
If we need such recovery code we could add it as an option to git fsck and have
git fsck be the only sanctioned way of bypassing the normal API and checks.
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
---
refs.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/refs.c b/refs.c
index 8848dbf..7da5357 100644
--- a/refs.c
+++ b/refs.c
@@ -2058,6 +2058,11 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
int missing = 0;
int attempts_remaining = 3;
+ if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) {
+ errno = EINVAL;
+ return NULL;
+ }
+
lock = xcalloc(1, sizeof(struct ref_lock));
lock->lock_fd = -1;
@@ -2149,8 +2154,6 @@ struct ref_lock *lock_any_ref_for_update(const char *refname,
const unsigned char *old_sha1,
int flags, int *type_p)
{
- if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL))
- return NULL;
return lock_ref_sha1_basic(refname, old_sha1, flags, type_p);
}
--
2.0.0.582.ge25c160
next prev parent reply other threads:[~2014-06-06 22:30 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-06 22:28 [PATCH v14 00/40] Use ref transactions Ronnie Sahlberg
2014-06-06 22:28 ` [PATCH v14 01/40] refs.c: remove ref_transaction_rollback Ronnie Sahlberg
2014-06-06 22:28 ` [PATCH v14 02/40] refs.c: ref_transaction_commit should not free the transaction Ronnie Sahlberg
2014-06-06 22:28 ` [PATCH v14 03/40] refs.c: constify the sha arguments for ref_transaction_create|delete|update Ronnie Sahlberg
2014-06-06 22:28 ` [PATCH v14 04/40] refs.c: allow passing NULL to ref_transaction_free Ronnie Sahlberg
2014-06-06 22:28 ` [PATCH v14 05/40] refs.c: add a strbuf argument to ref_transaction_commit for error logging Ronnie Sahlberg
2014-06-06 22:28 ` [PATCH v14 06/40] refs.c: add an err argument to repack_without_refs Ronnie Sahlberg
2014-06-10 20:10 ` Jonathan Nieder
2014-06-10 21:46 ` Ronnie Sahlberg
2014-06-06 22:28 ` [PATCH v14 07/40] refs.c: make ref_update_reject_duplicates take a strbuf argument for errors Ronnie Sahlberg
2014-06-06 22:28 ` [PATCH v14 08/40] refs.c: add an err argument to delete_ref_loose Ronnie Sahlberg
2014-06-10 22:49 ` Jonathan Nieder
2014-06-11 18:21 ` Ronnie Sahlberg
2014-06-06 22:28 ` [PATCH v14 09/40] refs.c: make update_ref_write update a strbuf on failure Ronnie Sahlberg
2014-06-06 22:28 ` [PATCH v14 10/40] update-ref: use err argument to get error from ref_transaction_commit Ronnie Sahlberg
2014-06-06 22:28 ` [PATCH v14 11/40] refs.c: remove the onerr argument to ref_transaction_commit Ronnie Sahlberg
2014-06-06 22:28 ` [PATCH v14 12/40] refs.c: change ref_transaction_update() to do error checking and return status Ronnie Sahlberg
2014-06-06 22:28 ` [PATCH v14 13/40] refs.c: change ref_transaction_create " Ronnie Sahlberg
2014-06-06 22:28 ` [PATCH v14 14/40] refs.c: update ref_transaction_delete to check for error " Ronnie Sahlberg
2014-06-06 22:28 ` [PATCH v14 15/40] refs.c: make ref_transaction_begin take an err argument Ronnie Sahlberg
2014-06-06 22:28 ` [PATCH v14 16/40] refs.c: add transaction.status and track OPEN/CLOSED/ERROR Ronnie Sahlberg
2014-06-10 22:53 ` Jonathan Nieder
2014-06-06 22:28 ` [PATCH v14 17/40] tag.c: use ref transactions when doing updates Ronnie Sahlberg
2014-06-06 22:28 ` [PATCH v14 18/40] replace.c: use the ref transaction functions for updates Ronnie Sahlberg
2014-06-06 22:28 ` [PATCH v14 19/40] commit.c: use ref transactions " Ronnie Sahlberg
2014-06-06 22:28 ` [PATCH v14 20/40] sequencer.c: use ref transactions for all ref updates Ronnie Sahlberg
2014-06-06 22:28 ` [PATCH v14 21/40] fast-import.c: change update_branch to use ref transactions Ronnie Sahlberg
2014-06-06 22:29 ` [PATCH v14 22/40] branch.c: use ref transaction for all ref updates Ronnie Sahlberg
2014-06-06 22:29 ` [PATCH v14 23/40] refs.c: change update_ref to use a transaction Ronnie Sahlberg
2014-06-06 22:29 ` [PATCH v14 24/40] receive-pack.c: use a reference transaction for updating the refs Ronnie Sahlberg
2014-06-10 23:18 ` Jonathan Nieder
2014-06-11 18:44 ` Ronnie Sahlberg
2014-06-06 22:29 ` [PATCH v14 25/40] fast-import.c: use a ref transaction when dumping tags Ronnie Sahlberg
2014-06-10 23:22 ` Jonathan Nieder
2014-06-06 22:29 ` [PATCH v14 26/40] walker.c: use ref transaction for ref updates Ronnie Sahlberg
2014-06-10 23:23 ` Jonathan Nieder
2014-06-06 22:29 ` [PATCH v14 27/40] refs.c: make lock_ref_sha1 static Ronnie Sahlberg
2014-06-06 22:29 ` [PATCH v14 28/40] refs.c: remove the update_ref_lock function Ronnie Sahlberg
2014-06-06 22:29 ` [PATCH v14 29/40] refs.c: remove the update_ref_write function Ronnie Sahlberg
2014-06-06 22:29 ` [PATCH v14 30/40] refs.c: remove lock_ref_sha1 Ronnie Sahlberg
2014-06-06 22:29 ` [PATCH v14 31/40] refs.c: make prune_ref use a transaction to delete the ref Ronnie Sahlberg
2014-06-10 23:37 ` Jonathan Nieder
2014-06-06 22:29 ` [PATCH v14 32/40] refs.c: make delete_ref use a transaction Ronnie Sahlberg
2014-06-06 22:29 ` [PATCH v14 33/40] refs.c: pass the ref log message to _create/delete/update instead of _commit Ronnie Sahlberg
2014-06-06 22:29 ` [PATCH v14 34/40] refs.c: pass NULL as *flags to read_ref_full Ronnie Sahlberg
2014-06-06 22:29 ` Ronnie Sahlberg [this message]
2014-06-06 22:29 ` [PATCH v14 36/40] refs.c: call lock_ref_sha1_basic directly from commit Ronnie Sahlberg
2014-06-06 22:29 ` [PATCH v14 37/40] refs.c: pass a skip list to name_conflict_fn Ronnie Sahlberg
2014-06-06 22:29 ` [PATCH v14 38/40] refs.c: propagate any errno==ENOTDIR from _commit back to the callers Ronnie Sahlberg
2014-06-06 22:29 ` [PATCH v14 39/40] fetch.c: change s_update_ref to use a ref transaction Ronnie Sahlberg
2014-06-06 22:29 ` [PATCH v14 40/40] refs.c: make write_ref_sha1 static Ronnie Sahlberg
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=1402093758-3162-36-git-send-email-sahlberg@google.com \
--to=sahlberg@google.com \
--cc=git@vger.kernel.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.
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).