From: Junio C Hamano <gitster@pobox.com>
To: Michael Haggerty <mhagger@alum.mit.edu>
Cc: Jens Lehmann <jens.lehmann@web.de>, git@vger.kernel.org
Subject: Re: [PATCH] resolve_gitlink_ref_recursive(): verify format of symbolic refs
Date: Fri, 27 Jun 2014 10:53:47 -0700 [thread overview]
Message-ID: <xmqqa98y2q8k.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1403866877-15733-1-git-send-email-mhagger@alum.mit.edu> (Michael Haggerty's message of "Fri, 27 Jun 2014 13:01:17 +0200")
Michael Haggerty <mhagger@alum.mit.edu> writes:
> When reading a symbolic ref via resolve_gitlink_ref_recursive(), check
> that the reference name that is pointed at is formatted correctly,
> using the same check as resolve_ref_unsafe() uses for non-gitlink
> references. This prevents bogosity like
>
> ref: ../../other/file
>
> from causing problems.
I do agree that a textual symref "ref: ../../x/y" that is stored in
".git/HEAD" or in ".git/refs/L" will step outside ".git/" and it is
problematic. But if ".git/refs/heads/a/b/LINK" has "ref: ../../x"
in it, shouldn't we interpret it as referring to the ref at
"refs/heads/x"?
> Given that symbolic references cannot be transferred via the Git
> protocol, I do not expect this bug to be exploitable.
>
> refs.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/refs.c b/refs.c
> index dc45774..7da8e7d 100644
> --- a/refs.c
> +++ b/refs.c
> @@ -1273,6 +1273,9 @@ static int resolve_gitlink_ref_recursive(struct ref_cache *refs,
> while (isspace(*p))
> p++;
>
> + if (check_refname_format(p, REFNAME_ALLOW_ONELEVEL))
> + return -1;
> +
> return resolve_gitlink_ref_recursive(refs, p, sha1, recursion+1);
> }
next prev parent reply other threads:[~2014-06-27 17:54 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-27 11:01 [PATCH] resolve_gitlink_ref_recursive(): verify format of symbolic refs Michael Haggerty
2014-06-27 17:53 ` Junio C Hamano [this message]
2014-06-27 17:59 ` Junio C Hamano
2014-06-28 5:34 ` Michael Haggerty
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=xmqqa98y2q8k.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jens.lehmann@web.de \
--cc=mhagger@alum.mit.edu \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.