summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBelal, Awais <Awais_Belal@mentor.com>2015-12-31 13:38:43 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-15 13:14:35 (GMT)
commitc1162207c92fc4f07b62e8c2177832350c412467 (patch)
tree41edcee32aa5c5a1469131c9f5cff7ce05229469
parenta690c381abbbd0ea896e37b81672f39c3b945087 (diff)
downloadpoky-c1162207c92fc4f07b62e8c2177832350c412467.tar.gz
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 <awais_belal@mentor.com> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-bsp/grub/files/0001-Fix-CVE-2015-8370-Grub2-user-pass-vulnerability.patch50
-rw-r--r--meta/recipes-bsp/grub/grub2.inc1
2 files changed, 51 insertions, 0 deletions
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 @@
1Upstream-Status: Accepted
2Signed-off-by: Awais Belal <awais_belal@mentor.com>
3
4From 451d80e52d851432e109771bb8febafca7a5f1f2 Mon Sep 17 00:00:00 2001
5From: Hector Marco-Gisbert <hecmargi@upv.es>
6Date: Wed, 16 Dec 2015 04:57:18 +0000
7Subject: Fix security issue when reading username and password
8
9This patch fixes two integer underflows at:
10 * grub-core/lib/crypto.c
11 * grub-core/normal/auth.c
12
13CVE-2015-8370
14
15Signed-off-by: Hector Marco-Gisbert <hecmargi@upv.es>
16Signed-off-by: Ismael Ripoll-Ripoll <iripoll@disca.upv.es>
17Also-By: Andrey Borzenkov <arvidjaar@gmail.com>
18---
19Index: grub-2.00/grub-core/lib/crypto.c
20===================================================================
21--- grub-2.00.orig/grub-core/lib/crypto.c
22+++ grub-2.00/grub-core/lib/crypto.c
23@@ -458,7 +458,8 @@ grub_password_get (char buf[], unsigned
24
25 if (key == '\b')
26 {
27- cur_len--;
28+ if (cur_len)
29+ cur_len--;
30 continue;
31 }
32
33Index: grub-2.00/grub-core/normal/auth.c
34===================================================================
35--- grub-2.00.orig/grub-core/normal/auth.c
36+++ grub-2.00/grub-core/normal/auth.c
37@@ -174,8 +174,11 @@ grub_username_get (char buf[], unsigned
38
39 if (key == '\b')
40 {
41- cur_len--;
42- grub_printf ("\b");
43+ if (cur_len)
44+ {
45+ cur_len--;
46+ grub_printf ("\b");
47+ }
48 continue;
49 }
50
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 \
25 file://grub-efi-allow-a-compilation-without-mcmodel-large.patch \ 25 file://grub-efi-allow-a-compilation-without-mcmodel-large.patch \
26 file://grub-efi-fix-with-glibc-2.20.patch \ 26 file://grub-efi-fix-with-glibc-2.20.patch \
27 file://0001-parse_dhcp_vendor-Add-missing-const-qualifiers.patch \ 27 file://0001-parse_dhcp_vendor-Add-missing-const-qualifiers.patch \
28 file://0001-Fix-CVE-2015-8370-Grub2-user-pass-vulnerability.patch \
28 " 29 "
29 30
30DEPENDS = "flex-native bison-native xz" 31DEPENDS = "flex-native bison-native xz"