From: Ronnie Sahlberg <sahlberg@google.com>
To: git@vger.kernel.org
Cc: Ronnie Sahlberg <sahlberg@google.com>
Subject: [PATCH v17 43/48] refs.c: move the check for valid refname to lock_ref_sha1_basic
Date: Mon, 16 Jun 2014 11:04:14 -0700 [thread overview]
Message-ID: <1402941859-29354-44-git-send-email-sahlberg@google.com> (raw)
In-Reply-To: <1402941859-29354-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 7b80bb3..69815d9 100644
--- a/refs.c
+++ b/refs.c
@@ -2062,6 +2062,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;
@@ -2153,8 +2158,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.282.g3799eda.dirty
next prev parent reply other threads:[~2014-06-16 18:05 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-16 18:03 [PATCH v17 00/48] Use ref transactions Ronnie Sahlberg
2014-06-16 18:03 ` [PATCH v17 01/48] refs.c: remove ref_transaction_rollback Ronnie Sahlberg
2014-06-16 18:03 ` [PATCH v17 02/48] refs.c: ref_transaction_commit should not free the transaction Ronnie Sahlberg
2014-06-16 18:03 ` [PATCH v17 03/48] refs.c: constify the sha arguments for ref_transaction_create|delete|update Ronnie Sahlberg
2014-06-16 18:03 ` [PATCH v17 04/48] refs.c: allow passing NULL to ref_transaction_free Ronnie Sahlberg
2014-06-16 18:03 ` [PATCH v17 05/48] refs.c: add a strbuf argument to ref_transaction_commit for error logging Ronnie Sahlberg
2014-06-16 18:03 ` [PATCH v17 06/48] lockfile.c: add a new public function unable_to_lock_message Ronnie Sahlberg
2014-06-16 18:03 ` [PATCH v17 07/48] lockfile.c: make lock_file return a meaningful errno on failurei Ronnie Sahlberg
2014-06-16 18:03 ` [PATCH v17 08/48] refs.c: add an err argument to repack_without_refs Ronnie Sahlberg
2014-06-16 18:03 ` [PATCH v17 09/48] refs.c: make sure log_ref_setup returns a meaningful errno Ronnie Sahlberg
2014-06-16 18:03 ` [PATCH v17 10/48] refs.c: verify_lock should set errno to something meaningful Ronnie Sahlberg
2014-06-16 18:03 ` [PATCH v17 11/48] refs.c: make remove_empty_directories alwasy set errno to something sane Ronnie Sahlberg
2014-06-16 18:03 ` [PATCH v17 12/48] refs.c: commit_packed_refs to return a meaningful errno on failure Ronnie Sahlberg
2014-06-16 18:03 ` [PATCH v17 13/48] refs.c: make resolve_ref_unsafe set errno to something meaningful on error Ronnie Sahlberg
2014-06-16 18:03 ` [PATCH v17 14/48] refs.c: log_ref_write should try to return meaningful errno Ronnie Sahlberg
2014-06-16 18:03 ` [PATCH v17 15/48] refs.c: make ref_update_reject_duplicates take a strbuf argument for errors Ronnie Sahlberg
2014-06-16 18:03 ` [PATCH v17 16/48] refs.c: add an err argument to delete_ref_loose Ronnie Sahlberg
2014-06-17 0:22 ` Junio C Hamano
2014-06-17 14:34 ` Ronnie Sahlberg
2014-06-17 15:55 ` Ronnie Sahlberg
2014-06-17 17:23 ` Junio C Hamano
2014-06-16 18:03 ` [PATCH v17 17/48] refs.c: make update_ref_write update a strbuf on failure Ronnie Sahlberg
2014-06-16 18:03 ` [PATCH v17 18/48] update-ref: use err argument to get error from ref_transaction_commit Ronnie Sahlberg
2014-06-16 18:03 ` [PATCH v17 19/48] refs.c: remove the onerr argument to ref_transaction_commit Ronnie Sahlberg
2014-06-16 18:03 ` [PATCH v17 20/48] refs.c: change ref_transaction_update() to do error checking and return status Ronnie Sahlberg
2014-06-16 18:03 ` [PATCH v17 21/48] refs.c: change ref_transaction_create " Ronnie Sahlberg
2014-06-16 18:03 ` [PATCH v17 22/48] refs.c: update ref_transaction_delete to check for error " Ronnie Sahlberg
2014-06-16 18:03 ` [PATCH v17 23/48] refs.c: make ref_transaction_begin take an err argument Ronnie Sahlberg
2014-06-16 18:03 ` [PATCH v17 24/48] refs.c: add transaction.status and track OPEN/CLOSED/ERROR Ronnie Sahlberg
2014-06-16 18:03 ` [PATCH v17 25/48] tag.c: use ref transactions when doing updates Ronnie Sahlberg
2014-06-16 18:03 ` [PATCH v17 26/48] replace.c: use the ref transaction functions for updates Ronnie Sahlberg
2014-06-16 18:03 ` [PATCH v17 27/48] commit.c: use ref transactions " Ronnie Sahlberg
2014-06-16 18:03 ` [PATCH v17 28/48] sequencer.c: use ref transactions for all ref updates Ronnie Sahlberg
2014-06-16 18:04 ` [PATCH v17 29/48] fast-import.c: change update_branch to use ref transactions Ronnie Sahlberg
2014-06-16 18:04 ` [PATCH v17 30/48] branch.c: use ref transaction for all ref updates Ronnie Sahlberg
2014-06-16 18:04 ` [PATCH v17 31/48] refs.c: change update_ref to use a transaction Ronnie Sahlberg
2014-06-16 18:04 ` [PATCH v17 32/48] receive-pack.c: use a reference transaction for updating the refs Ronnie Sahlberg
2014-06-16 18:04 ` [PATCH v17 33/48] fast-import.c: use a ref transaction when dumping tags Ronnie Sahlberg
2014-06-16 18:04 ` [PATCH v17 34/48] walker.c: use ref transaction for ref updates Ronnie Sahlberg
2014-06-16 18:04 ` [PATCH v17 35/48] refs.c: make lock_ref_sha1 static Ronnie Sahlberg
2014-06-16 18:04 ` [PATCH v17 36/48] refs.c: remove the update_ref_lock function Ronnie Sahlberg
2014-06-16 18:04 ` [PATCH v17 37/48] refs.c: remove the update_ref_write function Ronnie Sahlberg
2014-06-16 18:04 ` [PATCH v17 38/48] refs.c: remove lock_ref_sha1 Ronnie Sahlberg
2014-06-16 18:04 ` [PATCH v17 39/48] refs.c: make prune_ref use a transaction to delete the ref Ronnie Sahlberg
2014-06-16 18:04 ` [PATCH v17 40/48] refs.c: make delete_ref use a transaction Ronnie Sahlberg
2014-06-16 18:04 ` [PATCH v17 41/48] refs.c: pass the ref log message to _create/delete/update instead of _commit Ronnie Sahlberg
2014-06-16 18:04 ` [PATCH v17 42/48] refs.c: pass NULL as *flags to read_ref_full Ronnie Sahlberg
2014-06-16 18:04 ` Ronnie Sahlberg [this message]
2014-06-16 18:04 ` [PATCH v17 44/48] refs.c: call lock_ref_sha1_basic directly from commit Ronnie Sahlberg
2014-06-16 18:04 ` [PATCH v17 45/48] refs.c: pass a skip list to name_conflict_fn Ronnie Sahlberg
2014-06-16 18:04 ` [PATCH v17 46/48] refs.c: propagate any errno==ENOTDIR from _commit back to the callers Ronnie Sahlberg
2014-06-16 18:04 ` [PATCH v17 47/48] fetch.c: change s_update_ref to use a ref transaction Ronnie Sahlberg
2014-06-16 18:04 ` [PATCH v17 48/48] 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
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=1402941859-29354-44-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.
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).