mirror of
https://git.yoctoproject.org/poky
synced 2026-02-11 11:13:04 +01:00
1824a583fa
Git is a revision control system. Prior to versions 2.30.9, 2.31.8, 2.32.7,
2.33.8, 2.34.8, 2.35.8, 2.36.6, 2.37.7, 2.38.5, 2.39.3, and 2.40.1, by feeding
specially crafted input to `git apply --reject`, a path outside the working
tree can be overwritten with partially controlled contents (corresponding to
the rejected hunk(s) from the given patch). A fix is available in versions
2.30.9, 2.31.8, 2.32.7, 2.33.8, 2.34.8, 2.35.8, 2.36.6, 2.37.7, 2.38.5, 2.39.3,
and 2.40.1. As a workaround, avoid using `git apply` with `--reject` when applying
patches from an untrusted source. Use `git apply --stat` to inspect a patch before
applying; avoid applying one that create a conflict where a link corresponding to
the `*.rej` file exists.
References:
https://nvd.nist.gov/vuln/detail/CVE-2023-25652
Upstream-Status: Backport from 9db05711c9
(From OE-Core rev: 6747482316b8f7839a09bf041d8c11b559f84b44)
Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
95 lines
3.3 KiB
Diff
95 lines
3.3 KiB
Diff
From 9db05711c98efc14f414d4c87135a34c13586e0b Mon Sep 17 00:00:00 2001
|
|
From: Johannes Schindelin <johannes.schindelin@gmx.de>
|
|
Date: Thu, 9 Mar 2023 16:02:54 +0100
|
|
Subject: [PATCH] apply --reject: overwrite existing `.rej` symlink if it
|
|
exists
|
|
|
|
The `git apply --reject` is expected to write out `.rej` files in case
|
|
one or more hunks fail to apply cleanly. Historically, the command
|
|
overwrites any existing `.rej` files. The idea being that
|
|
apply/reject/edit cycles are relatively common, and the generated `.rej`
|
|
files are not considered precious.
|
|
|
|
But the command does not overwrite existing `.rej` symbolic links, and
|
|
instead follows them. This is unsafe because the same patch could
|
|
potentially create such a symbolic link and point at arbitrary paths
|
|
outside the current worktree, and `git apply` would write the contents
|
|
of the `.rej` file into that location.
|
|
|
|
Therefore, let's make sure that any existing `.rej` file or symbolic
|
|
link is removed before writing it.
|
|
|
|
Reported-by: RyotaK <ryotak.mail@gmail.com>
|
|
Helped-by: Taylor Blau <me@ttaylorr.com>
|
|
Helped-by: Junio C Hamano <gitster@pobox.com>
|
|
Helped-by: Linus Torvalds <torvalds@linuxfoundation.org>
|
|
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
|
|
|
|
Upstream-Status: Backport [https://github.com/git/git/commit/9db05711c98efc14f414d4c87135a34c13586e0b]
|
|
CVE: CVE-2023-25652
|
|
Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com>
|
|
---
|
|
apply.c | 14 ++++++++++++--
|
|
t/t4115-apply-symlink.sh | 15 +++++++++++++++
|
|
2 files changed, 27 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/apply.c b/apply.c
|
|
index 4f303bf..aa7111d 100644
|
|
--- a/apply.c
|
|
+++ b/apply.c
|
|
@@ -4531,7 +4531,7 @@ static int write_out_one_reject(struct apply_state *state, struct patch *patch)
|
|
FILE *rej;
|
|
char namebuf[PATH_MAX];
|
|
struct fragment *frag;
|
|
- int cnt = 0;
|
|
+ int fd, cnt = 0;
|
|
struct strbuf sb = STRBUF_INIT;
|
|
|
|
for (cnt = 0, frag = patch->fragments; frag; frag = frag->next) {
|
|
@@ -4571,7 +4571,17 @@ static int write_out_one_reject(struct apply_state *state, struct patch *patch)
|
|
memcpy(namebuf, patch->new_name, cnt);
|
|
memcpy(namebuf + cnt, ".rej", 5);
|
|
|
|
- rej = fopen(namebuf, "w");
|
|
+ fd = open(namebuf, O_CREAT | O_EXCL | O_WRONLY, 0666);
|
|
+ if (fd < 0) {
|
|
+ if (errno != EEXIST)
|
|
+ return error_errno(_("cannot open %s"), namebuf);
|
|
+ if (unlink(namebuf))
|
|
+ return error_errno(_("cannot unlink '%s'"), namebuf);
|
|
+ fd = open(namebuf, O_CREAT | O_EXCL | O_WRONLY, 0666);
|
|
+ if (fd < 0)
|
|
+ return error_errno(_("cannot open %s"), namebuf);
|
|
+ }
|
|
+ rej = fdopen(fd, "w");
|
|
if (!rej)
|
|
return error_errno(_("cannot open %s"), namebuf);
|
|
|
|
diff --git a/t/t4115-apply-symlink.sh b/t/t4115-apply-symlink.sh
|
|
index 1acb7b2..2b034ff 100755
|
|
--- a/t/t4115-apply-symlink.sh
|
|
+++ b/t/t4115-apply-symlink.sh
|
|
@@ -125,4 +125,19 @@ test_expect_success SYMLINKS 'symlink escape when deleting file' '
|
|
test_path_is_file .git/delete-me
|
|
'
|
|
|
|
+test_expect_success SYMLINKS '--reject removes .rej symlink if it exists' '
|
|
+ test_when_finished "git reset --hard && git clean -dfx" &&
|
|
+
|
|
+ test_commit file &&
|
|
+ echo modified >file.t &&
|
|
+ git diff -- file.t >patch &&
|
|
+ echo modified-again >file.t &&
|
|
+
|
|
+ ln -s foo file.t.rej &&
|
|
+ test_must_fail git apply patch --reject 2>err &&
|
|
+ test_i18ngrep "Rejected hunk" err &&
|
|
+ test_path_is_missing foo &&
|
|
+ test_path_is_file file.t.rej
|
|
+'
|
|
+
|
|
test_done
|
|
--
|
|
2.25.1
|
|
|