Skip to contentSkip to conversation

git: Security Advisory - git - CVE-2020-11008

PATCH New Li Zhou 1 participant 1 message Apr 27, 2020

lore
Share & tools
lore

Li Zhou

author
#0 lore raw

PATCH 1/1 git: Security Advisory - git - CVE-2020-11008

Backport the 1st -- 9th patches listed by
<https://github.com/git/git/compare/v2.17.4...v2.17.5>
to solve CVE-2020-11008.

Also backport the 2nd -- 4th patches listed by
<https://github.com/git/git/compare/v2.17.3...v2.17.4>
for CVE-2020-5260 (not necessary, and only the 1st patch is necessary for this CVE), because some of the above 9 patches are based on them.

---
 meta/recipes-devtools/git/git.inc                  |  12 +
 ...edential-use-test_i18ncmp-to-check-stderr.patch |  35 +++
 ...detect-unrepresentable-values-when-parsin.patch | 156 +++++++++++
 ...ct-gitmodules-URLs-with-embedded-newlines.patch | 103 ++++++++
 .../git/git/CVE-2020-11008-1.patch                 |  70 +++++
 .../git/git/CVE-2020-11008-2.patch                 | 292 +++++++++++++++++++++
 .../git/git/CVE-2020-11008-3.patch                 |  97 +++++++
 .../git/git/CVE-2020-11008-4.patch                 | 173 ++++++++++++
 .../git/git/CVE-2020-11008-5.patch                 | 211 +++++++++++++++
 .../git/git/CVE-2020-11008-6.patch                 |  84 ++++++
 .../git/git/CVE-2020-11008-7.patch                 | 206 +++++++++++++++
 .../git/git/CVE-2020-11008-8.patch                 | 114 ++++++++
 .../git/git/CVE-2020-11008-9.patch                 | 114 ++++++++
 13 files changed, 1667 insertions(+)
 create mode 100644 meta/recipes-devtools/git/git/0001-t-lib-credential-use-test_i18ncmp-to-check-stderr.patch
 create mode 100644 meta/recipes-devtools/git/git/0002-credential-detect-unrepresentable-values-when-parsin.patch
 create mode 100644 meta/recipes-devtools/git/git/0003-fsck-detect-gitmodules-URLs-with-embedded-newlines.patch
 create mode 100644 meta/recipes-devtools/git/git/CVE-2020-11008-1.patch
 create mode 100644 meta/recipes-devtools/git/git/CVE-2020-11008-2.patch
 create mode 100644 meta/recipes-devtools/git/git/CVE-2020-11008-3.patch
 create mode 100644 meta/recipes-devtools/git/git/CVE-2020-11008-4.patch
 create mode 100644 meta/recipes-devtools/git/git/CVE-2020-11008-5.patch
 create mode 100644 meta/recipes-devtools/git/git/CVE-2020-11008-6.patch
 create mode 100644 meta/recipes-devtools/git/git/CVE-2020-11008-7.patch
 create mode 100644 meta/recipes-devtools/git/git/CVE-2020-11008-8.patch
 create mode 100644 meta/recipes-devtools/git/git/CVE-2020-11008-9.patch
meta/recipes-devtools/git/git.inc +12 -0
index 176423e..a0ce162 100644
@@ -9,6 +9,18 @@ PROVIDES_append_class-native = " git-replacement-native"
 SRC_URI = "${KERNELORG_MIRROR}/software/scm/git/git-${PV}.tar.gz;name=tarball \
            ${KERNELORG_MIRROR}/software/scm/git/git-manpages-${PV}.tar.gz;name=manpages \
            file://CVE-2020-5260.patch \
+           file://0001-t-lib-credential-use-test_i18ncmp-to-check-stderr.patch \
+           file://0002-credential-detect-unrepresentable-values-when-parsin.patch \
+           file://0003-fsck-detect-gitmodules-URLs-with-embedded-newlines.patch \
+           file://CVE-2020-11008-1.patch \
+           file://CVE-2020-11008-2.patch \
+           file://CVE-2020-11008-3.patch \
+           file://CVE-2020-11008-4.patch \
+           file://CVE-2020-11008-5.patch \
+           file://CVE-2020-11008-6.patch \
+           file://CVE-2020-11008-7.patch \
+           file://CVE-2020-11008-8.patch \
+           file://CVE-2020-11008-9.patch \
           "
 
 S = "${WORKDIR}/git-${PV}"
meta/recipes-devtools/git/git/0001-t-lib-credential-use-test_i18ncmp-to-check-stderr.patch new file +35 -0
new file mode 100644
index 0000000..6eb3c16
@@ -0,0 +1,35 @@
+From 70ef9c6ce884b2d466d3d36563f1d2aa31b56443 Mon Sep 17 00:00:00 2001
+From: Jeff King <[email protected]>
+Date: Wed, 11 Mar 2020 18:11:37 -0400
+Subject: [PATCH 01/12] t/lib-credential: use test_i18ncmp to check stderr
+
+The credential tests have a "check" function which feeds some input to
+git-credential and checks the stdout and stderr. We look for exact
+matches in the output. For stdout, this makes sense; the output is
+the credential protocol. But for stderr, we may be showing various
+diagnostic messages, or the prompts fed to the askpass program, which
+could be translated. Let's mark them as such.
+
+Upstream-Status: Backport
+
+Signed-off-by: Li Zhou <[email protected]>
+---
+ t/lib-credential.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/t/lib-credential.sh b/t/lib-credential.sh
+index 937b831..bb88cc0 100755
+--- a/t/lib-credential.sh
++++ b/t/lib-credential.sh
+@@ -19,7 +19,7 @@ check() {
+ 		false
+ 	fi &&
+ 	test_cmp expect-stdout stdout &&
+-	test_cmp expect-stderr stderr
++	test_i18ncmp expect-stderr stderr
+ }
+ 
+ read_chunk() {
+-- 
+1.9.1
+
meta/recipes-devtools/git/git/0002-credential-detect-unrepresentable-values-when-parsin.patch new file +156 -0

156 lines not on this page · raw message

meta/recipes-devtools/git/git/0003-fsck-detect-gitmodules-URLs-with-embedded-newlines.patch new file +103 -0

103 lines not on this page · raw message

meta/recipes-devtools/git/git/CVE-2020-11008-1.patch new file +70 -0

70 lines not on this page · raw message

meta/recipes-devtools/git/git/CVE-2020-11008-2.patch new file +292 -0

292 lines not on this page · raw message

meta/recipes-devtools/git/git/CVE-2020-11008-3.patch new file +97 -0

97 lines not on this page · raw message

meta/recipes-devtools/git/git/CVE-2020-11008-4.patch new file +173 -0

173 lines not on this page · raw message

meta/recipes-devtools/git/git/CVE-2020-11008-5.patch new file +211 -0

211 lines not on this page · raw message

meta/recipes-devtools/git/git/CVE-2020-11008-6.patch new file +84 -0

84 lines not on this page · raw message

meta/recipes-devtools/git/git/CVE-2020-11008-7.patch new file +206 -0

206 lines not on this page · raw message

meta/recipes-devtools/git/git/CVE-2020-11008-8.patch new file +114 -0

114 lines not on this page · raw message

meta/recipes-devtools/git/git/CVE-2020-11008-9.patch new file +114 -0

114 lines not on this page · raw message

Signature · 1 line
1.9.1