diff options
| author |   Armin Kuster <akuster@mvista.com> | 2016-01-31 07:46:32 -0800 |
|---|---|---|
| committer |   Saul Wold <sgw@linux.intel.com> | 2016-02-01 08:24:05 -0800 |
| commit | b63e3b57b47e95003a1fb014f90333c327681d5b (patch) | |
| tree | 678f65f59e5e6c4dea23ea2b1349180b2cebb05d /meta | |
| parent | f2b16d0f9c3ad67fdf63e9e41f42a6d54f1043e4 (diff) | |
| download | openembedded-core-contrib-b63e3b57b47e95003a1fb014f90333c327681d5b.tar.gz | |
grub: Security fix CVE-2015-8370
CVE-2015-8370 grub2: buffer overflow when checking password entered during bootup
Signed-off-by: Armin Kuster <akuster@mvista.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-bsp/grub/files/CVE-2015-8370.patch | 59 | ||||
| -rw-r--r-- | meta/recipes-bsp/grub/grub2.inc | 1 |
2 files changed, 60 insertions, 0 deletions
diff --git a/meta/recipes-bsp/grub/files/CVE-2015-8370.patch b/meta/recipes-bsp/grub/files/CVE-2015-8370.patch new file mode 100644 index 0000000000..78f514e03d --- /dev/null +++ b/meta/recipes-bsp/grub/files/CVE-2015-8370.patch @@ -0,0 +1,59 @@ +From 451d80e52d851432e109771bb8febafca7a5f1f2 Mon Sep 17 00:00:00 2001 +From: Hector Marco-Gisbert <hecmargi@upv.es> +Date: Wed, 16 Dec 2015 07:57:18 +0300 +Subject: [PATCH] Fix security issue when reading username and password + +This patch fixes two integer underflows at: + * grub-core/lib/crypto.c + * grub-core/normal/auth.c + +CVE-2015-8370 + +Signed-off-by: Hector Marco-Gisbert <hecmargi@upv.es> +Signed-off-by: Ismael Ripoll-Ripoll <iripoll@disca.upv.es> +Also-By: Andrey Borzenkov <arvidjaar@gmail.com> + +Upstream-Status: Backport + +http://git.savannah.gnu.org/cgit/grub.git/commit/?id=451d80e52d851432e109771bb8febafca7a5f1f2 + +CVE: CVE-2015-8370 +Signed-off-by: Armin Kuster <akuster@mvista.com> + +--- + grub-core/lib/crypto.c | 3 ++- + grub-core/normal/auth.c | 7 +++++-- + 2 files changed, 7 insertions(+), 3 deletions(-) + +Index: git/grub-core/lib/crypto.c +=================================================================== +--- git.orig/grub-core/lib/crypto.c ++++ git/grub-core/lib/crypto.c +@@ -458,7 +458,8 @@ grub_password_get (char buf[], unsigned + + if (key == '\b') + { +- cur_len--; ++ if (cur_len) ++ cur_len--; + continue; + } + +Index: git/grub-core/normal/auth.c +=================================================================== +--- git.orig/grub-core/normal/auth.c ++++ git/grub-core/normal/auth.c +@@ -174,8 +174,11 @@ grub_username_get (char buf[], unsigned + + if (key == '\b') + { +- cur_len--; +- grub_printf ("\b"); ++ if (cur_len) ++ { ++ cur_len--; ++ grub_printf ("\b"); ++ } + continue; + } + diff --git a/meta/recipes-bsp/grub/grub2.inc b/meta/recipes-bsp/grub/grub2.inc index 312771b47f..fe2407cef0 100644 --- a/meta/recipes-bsp/grub/grub2.inc +++ b/meta/recipes-bsp/grub/grub2.inc @@ -27,6 +27,7 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \ file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ file://0001-parse_dhcp_vendor-Add-missing-const-qualifiers.patch \ file://grub2-fix-initrd-size-bug.patch \ + file://CVE-2015-8370.patch \ " DEPENDS = "flex-native bison-native xz" |