summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2020-12-30 17:44:17 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-01-09 09:17:17 +0000
commit007144363339ff7c240b24136dc659f7a68ec56b (patch)
tree789167aa7010bb4372fc050bd67256faab6ec718
parentc676d048e604a085ea23686276c387c4003c7b2f (diff)
downloadpoky-007144363339ff7c240b24136dc659f7a68ec56b.tar.gz
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. (From OE-Core rev: d686a3eb928d316a4e53979fda48b205ba9104bc) Signed-off-by: Scott Murray <scott.murray@konsulko.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 396d5c0f9cffa4b54ae94738b1ef2b6fb545f082) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-bsp/grub/files/CVE-2020-14309-CVE-2020-14310-CVE-2020-14311-malloc-Use-overflow-checking-primitives-where-we-do-.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-bsp/grub/files/CVE-2020-14309-CVE-2020-14310-CVE-2020-14311-malloc-Use-overflow-checking-primitives-where-we-do-.patch b/meta/recipes-bsp/grub/files/CVE-2020-14309-CVE-2020-14310-CVE-2020-14311-malloc-Use-overflow-checking-primitives-where-we-do-.patch
index 896a2145d4..7214ead9a7 100644
--- a/meta/recipes-bsp/grub/files/CVE-2020-14309-CVE-2020-14310-CVE-2020-14311-malloc-Use-overflow-checking-primitives-where-we-do-.patch
+++ b/meta/recipes-bsp/grub/files/CVE-2020-14309-CVE-2020-14310-CVE-2020-14311-malloc-Use-overflow-checking-primitives-where-we-do-.patch
@@ -30,7 +30,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
30Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> 30Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
31 31
32Upstream-Status: Backport 32Upstream-Status: Backport
33CVE: CVE-2020-14309, CVE-2020-14310, CVE-2020-14311 33CVE: CVE-2020-14309 CVE-2020-14310 CVE-2020-14311
34 34
35Reference to upstream patch: 35Reference to upstream patch:
36https://git.savannah.gnu.org/cgit/grub.git/commit/?id=3f05d693d1274965ffbe4ba99080dc2c570944c6 36https://git.savannah.gnu.org/cgit/grub.git/commit/?id=3f05d693d1274965ffbe4ba99080dc2c570944c6