From c1162207c92fc4f07b62e8c2177832350c412467 Mon Sep 17 00:00:00 2001 From: "Belal, Awais" Date: Thu, 31 Dec 2015 13:38:43 +0000 Subject: grub2: Fix CVE-2015-8370 http://git.savannah.gnu.org/cgit/grub.git/commit/?id=451d80e52d851432e109771bb8febafca7a5f1f2 (From OE-Core rev: 3f2701c102e4e5b95fc79a8d967f9c48f8232fc6) Signed-off-by: Awais Belal Signed-off-by: Armin Kuster Signed-off-by: Joshua Lock Signed-off-by: Richard Purdie --- ...E-2015-8370-Grub2-user-pass-vulnerability.patch | 50 ++++++++++++++++++++++ meta/recipes-bsp/grub/grub2.inc | 1 + 2 files changed, 51 insertions(+) create mode 100644 meta/recipes-bsp/grub/files/0001-Fix-CVE-2015-8370-Grub2-user-pass-vulnerability.patch (limited to 'meta') diff --git a/meta/recipes-bsp/grub/files/0001-Fix-CVE-2015-8370-Grub2-user-pass-vulnerability.patch b/meta/recipes-bsp/grub/files/0001-Fix-CVE-2015-8370-Grub2-user-pass-vulnerability.patch new file mode 100644 index 0000000..9ddd7a6 --- /dev/null +++ b/meta/recipes-bsp/grub/files/0001-Fix-CVE-2015-8370-Grub2-user-pass-vulnerability.patch @@ -0,0 +1,50 @@ +Upstream-Status: Accepted +Signed-off-by: Awais Belal + +From 451d80e52d851432e109771bb8febafca7a5f1f2 Mon Sep 17 00:00:00 2001 +From: Hector Marco-Gisbert +Date: Wed, 16 Dec 2015 04:57:18 +0000 +Subject: 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 +Signed-off-by: Ismael Ripoll-Ripoll +Also-By: Andrey Borzenkov +--- +Index: grub-2.00/grub-core/lib/crypto.c +=================================================================== +--- grub-2.00.orig/grub-core/lib/crypto.c ++++ grub-2.00/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: grub-2.00/grub-core/normal/auth.c +=================================================================== +--- grub-2.00.orig/grub-core/normal/auth.c ++++ grub-2.00/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 8e733ec..c281098 100644 --- a/meta/recipes-bsp/grub/grub2.inc +++ b/meta/recipes-bsp/grub/grub2.inc @@ -25,6 +25,7 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \ file://grub-efi-allow-a-compilation-without-mcmodel-large.patch \ file://grub-efi-fix-with-glibc-2.20.patch \ file://0001-parse_dhcp_vendor-Add-missing-const-qualifiers.patch \ + file://0001-Fix-CVE-2015-8370-Grub2-user-pass-vulnerability.patch \ " DEPENDS = "flex-native bison-native xz" -- cgit v1.1