Junio C Hamano <gitster@xxxxxxxxx> writes:
> Junio C Hamano <gitster@xxxxxxxxx> writes:
>
>> If the user wants to apply a patch that touches ../etc/shadow, is
>> the tool in the place to complain?"
>
> Let me take this part back.
>
> I think "git apply" should behave closely to "git apply --index"
> (which is used by "git am" unless there is a very good reason not to
> (and "'git apply --index' behaves differently from GNU patch, and we
> should match what the latter does" is not a very good reason). When
> the index guards the working tree, we do not follow any symlink,
> whether the destination is inside the current directory or not.
>
> I however do not think the current "git apply" notices that it will
> overwrite a path beyond a symlink---we may need to fix that if that
> is the case. I'll see what I can find (but I'll be doing 2.3-rc2
> today so it may be later this week).
Yikes. It turns out that the index is what protects us from going
outside the working tree. "apply --index" (hence "am") is immune
against the CVE-2015-1196, but that is not because we do not follow
symbolic links.
Also the solution is not just a simple has_symlink_leading_path().
Here is tonight's snapshot of what I've found out (not tested beyond
passing the test suite including the new test added by the patch).
-- >8 --
Subject: [PATCH] apply: refuse touching a file beyond symlink
Because Git tracks symbolic links as symbolic links, a path that has
a symbolic link in its leading part (e.g. path/to/dir being a
symbolic link to somewhere else, be it inside or outside the working
tree) can never appear in a patch that validly apply, unless the
same patch first removes the symbolic link.
Detect and reject such a patch. Things to note:
- Unfortunately, we cannot reuse the has_symlink_leading_path()
from dir.c, as that is only about the working tree, but "git
apply" can be told to apply the patch only to the index.
- We cannot directly use has_symlink_leading_path() even when we
are applying to the working tree, as an early patch of a valid
input may remove a symbolic link path/to/dir and then a later
patch of the input may create a path path/to/dir/file. The
leading symbolic link check must be done on the interim result we
compute in core (i.e. after the first patch, there is no
path/to/dir symbolic link and it is perfectly valid to create
path/to/dir/file). Similarly, when an input creates a symbolic
link path/to/dir and then creates a file path/to/dir/file, we
need to flag it as an error without actually creating path/to/dir
symbolic link in the filesystem.
- Instead, for any patch in the input that leaves a path (i.e. a
non deletion) in the result, we check all leading paths against
interim result and then either the index or the working tree.
The interim result of applying patch is already kept track of
by fn_table logic for us.
Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
---
builtin/apply.c | 44 +++++++++++++++++++++++++++++++++++++++++
t/t4122-apply-symlink-inside.sh | 37 ++++++++++++++++++++++++++++++++++
2 files changed, 81 insertions(+)
diff --git a/builtin/apply.c b/builtin/apply.c
index ef32e4f..da088c5 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -3483,6 +3483,46 @@ static int check_to_create(const char *new_name, int ok_if_exists)
return 0;
}
+static int path_is_beyond_symlink(const char *name_)
+{
+ struct strbuf name = STRBUF_INIT;
+
+ strbuf_addstr(&name, name_);
+ do {
+ struct patch *previous;
+
+ while (--name.len && name.buf[name.len] != '/')
+ ; /* scan backwards */
+ if (!name.len)
+ break;
+ name.buf[name.len] = '\0';
+ previous = in_fn_table(name.buf);
+ if (previous) {
+ if (!was_deleted(previous) &&
+ !to_be_deleted(previous) &&
+ previous->new_mode &&
+ S_ISLNK(previous->new_mode))
+ goto symlink_found;
+ } else if (check_index) {
+ int pos = cache_name_pos(name.buf, name.len);
+ if (0 <= pos &&
+ S_ISLNK(active_cache[pos]->ce_mode))
+ goto symlink_found;
+ } else {
+ struct stat st;
+ if (!lstat(name.buf, &st) && S_ISLNK(st.st_mode))
+ goto symlink_found;
+ }
+ } while (1);
+
+ strbuf_release(&name);
+ return 0;
+symlink_found:
+ strbuf_release(&name);
+ return -1;
+
+}
+
/*
* Check and apply the patch in-core; leave the result in patch->result
* for the caller to write it out to the final destination.
@@ -3570,6 +3610,10 @@ static int check_patch(struct patch *patch)
}
}
+ if (!patch->is_delete && path_is_beyond_symlink(patch->new_name))
+ return error(_("affected file '%s' is beyond a symbolic link"),
+ patch->new_name);
+
if (apply_data(patch, &st, ce) < 0)
return error(_("%s: patch does not apply"), name);
patch->rejected = 0;
diff --git a/t/t4122-apply-symlink-inside.sh b/t/t4122-apply-symlink-inside.sh
index 70b3a06..8b11bc6 100755
--- a/t/t4122-apply-symlink-inside.sh
+++ b/t/t4122-apply-symlink-inside.sh
@@ -52,4 +52,41 @@ test_expect_success 'check result' '
'
+test_expect_success 'do not follow symbolic link' '
+
+ git reset --hard &&
+ test_ln_s_add ../i386/dir arch/x86_64/dir &&
+ git diff HEAD >add_symlink.patch &&
+ git reset --hard &&
+
+ mkdir arch/x86_64/dir &&
+ >arch/x86_64/dir/file &&
+ git add arch/x86_64/dir/file &&
+ git diff HEAD >add_file.patch &&
+ git reset --hard &&
+ rm -fr arch/x86_64/dir &&
+
+ cat add_symlink.patch add_file.patch >patch &&
+
+ mkdir arch/i386/dir &&
+
+ test_must_fail git apply patch 2>error-wt &&
+ test_i18ngrep "beyond a symbolic link" error-wt &&
+ test ! -e arch/x86_64/dir &&
+ test ! -e arch/i386/dir/file &&
+
+ test_must_fail git apply --index patch 2>error-ix &&
+ test_i18ngrep "beyond a symbolic link" error-ix &&
+ test ! -e arch/x86_64/dir &&
+ test ! -e arch/i386/dir/file &&
+ test_must_fail git ls-files --error-unmatch arch/x86_64/dir &&
+ test_must_fail git ls-files --error-unmatch arch/i386/dir &&
+
+ test_must_fail git apply --cached patch 2>error-ct &&
+ test_i18ngrep "beyond a symbolic link" error-ct &&
+ test_must_fail git ls-files --error-unmatch arch/x86_64/dir &&
+ test_must_fail git ls-files --error-unmatch arch/i386/dir
+
+'
+
test_done
--
2.3.0-rc2-149-gdd42ee9
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html