A couple of CVE fixes
cover A couple of CVE fixes
A couple of hopefully straightforward fixes to knock some CVEs off the unpatched list. The grub change does not add a patch but fixes the existing "CVE:" line in a patch so all the associated CVEs will be picked up as patched.
Scott Murray (2):
grub: fix "CVE:" line in one of the patches
patch: fix CVE-2019-20633
...low-checking-primitives-where-we-do-.patch | 2 +- .../patch/patch/CVE-2019-20633.patch | 31 +++++++++++++++++++ meta/recipes-devtools/patch/patch_2.7.6.bb | 1 + 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/patch/patch/CVE-2019-20633.patch
Signature · 1 line
2.26.2
PATCH 1/2 grub: fix "CVE:" line in one of the patches
The "CVE:" line in the patch for CVEs 2020-14309, CVE-2020-14310, and CVE-2020-14311 had commas between the CVE numbers, which resulted in CVE-2020-14310 not being picked up as patched by cve-check.bbclass's parsing. Remove the commas to match cve-check.bbclass's expectations.
--- ...1-malloc-Use-overflow-checking-primitives-where-we-do-.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-bsp/grub/files/CVE-2020-14309-CVE-2020-14310-CVE-2020-14311-malloc-Use-overflow-checking-primitives-where-we-do-.patch +1 -1
@@ -30,7 +30,7 @@ Signed-off-by: Peter Jones <[email protected]> Reviewed-by: Daniel Kiper <[email protected]> Upstream-Status: Backport -CVE: CVE-2020-14309, CVE-2020-14310, CVE-2020-14311 +CVE: CVE-2020-14309 CVE-2020-14310 CVE-2020-14311 Reference to upstream patch: https://git.savannah.gnu.org/cgit/grub.git/commit/?id=3f05d693d1274965ffbe4ba99080dc2c570944c6
Signature · 1 line
2.26.2
PATCH 2/2 patch: fix CVE-2019-20633
In reply to Scott Murray* CVE detail: https://nvd.nist.gov/vuln/detail/CVE-2019-20633
* upstream tracking: https://savannah.gnu.org/bugs/index.php?56683
* Fixes potential for double free after incomplete fix for CVE-2018-6952
- src/pch.c (another_hunk): Avoid invalid memory access in context format diffs.
--- .../patch/patch/CVE-2019-20633.patch | 31 +++++++++++++++++++ meta/recipes-devtools/patch/patch_2.7.6.bb | 1 + 2 files changed, 32 insertions(+) create mode 100644 meta/recipes-devtools/patch/patch/CVE-2019-20633.patch
meta/recipes-devtools/patch/patch/CVE-2019-20633.patch new file +31 -0
@@ -0,0 +1,31 @@ +From 15b158db3ae11cb835f2eb8d2eb48e09d1a4af48 Mon Sep 17 00:00:00 2001 +From: Andreas Gruenbacher <[email protected]> +Date: Mon, 15 Jul 2019 19:10:02 +0200 +Subject: Avoid invalid memory access in context format diffs + +* src/pch.c (another_hunk): Avoid invalid memory access in context format +diffs. + +CVE: CVE-2019-20633 +Upstream-Status: Backport[https://git.savannah.gnu.org/cgit/patch.git/patch/?id=15b158db3ae11cb835f2eb8d2eb48e09d1a4af48] +Signed-off-by: Scott Murray <[email protected]> + +--- + src/pch.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/pch.c b/src/pch.c +index a500ad9..cb54e03 100644 +--- a/src/pch.c ++++ b/src/pch.c +@@ -1328,6 +1328,7 @@ another_hunk (enum diff difftype, bool rev) + ptrn_prefix_context = context; + ptrn_suffix_context = context; + if (repl_beginning ++ || p_end <= 0 + || (p_end + != p_ptrn_lines + 1 + (p_Char[p_end - 1] == '\n'))) + { +-- +cgit v1.2.1 +
meta/recipes-devtools/patch/patch_2.7.6.bb +1 -0
@@ -10,6 +10,7 @@ SRC_URI += "file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ file://0001-Invoke-ed-directly-instead-of-using-the-shell.patch \ file://0001-Don-t-leak-temporary-file-on-failed-ed-style-patch.patch \ file://0001-Don-t-leak-temporary-file-on-failed-multi-file-ed.patch \ + file://CVE-2019-20633.patch \ " SRC_URI[md5sum] = "4c68cee989d83c87b00a3860bcd05600"
Signature · 1 line
2.26.2