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-30 12:03:15 (GMT)
commit79e4cc8954482d66a633f10092aee8dda0b7da8e (patch)
tree2df611c97c792cbe5e1eaca1e791b1f908072fab
parentfaf6ada4f27a280e60ba72096f54cc5d2351fa16 (diff)
downloadpoky-79e4cc8954482d66a633f10092aee8dda0b7da8e.tar.gz
grub2: Fix CVE-2015-8370
http://git.savannah.gnu.org/cgit/grub.git/commit/?id=451d80e52d851432e109771bb8febafca7a5f1f2 (From OE-Core rev: 76ef966b1f47663f570e87aeb21bc98147b0eca2) Signed-off-by: Awais Belal <awais_belal@mentor.com> Signed-off-by: Armin Kuster <akuster808@gmail.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/grub-efi_2.00.bb1
-rw-r--r--meta/recipes-bsp/grub/grub_2.00.bb1
3 files changed, 52 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/grub-efi_2.00.bb b/meta/recipes-bsp/grub/grub-efi_2.00.bb
index 7674255..6822e7a 100644
--- a/meta/recipes-bsp/grub/grub-efi_2.00.bb
+++ b/meta/recipes-bsp/grub/grub-efi_2.00.bb
@@ -30,6 +30,7 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \
30 file://grub-2.00-add-oe-kernel.patch \ 30 file://grub-2.00-add-oe-kernel.patch \
31 file://grub-efi-fix-with-glibc-2.20.patch \ 31 file://grub-efi-fix-with-glibc-2.20.patch \
32 file://0001-parse_dhcp_vendor-Add-missing-const-qualifiers.patch \ 32 file://0001-parse_dhcp_vendor-Add-missing-const-qualifiers.patch \
33 file://0001-Fix-CVE-2015-8370-Grub2-user-pass-vulnerability.patch \
33 " 34 "
34SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c" 35SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c"
35SRC_URI[sha256sum] = "65b39a0558f8c802209c574f4d02ca263a804e8a564bc6caf1cd0fd3b3cc11e3" 36SRC_URI[sha256sum] = "65b39a0558f8c802209c574f4d02ca263a804e8a564bc6caf1cd0fd3b3cc11e3"
diff --git a/meta/recipes-bsp/grub/grub_2.00.bb b/meta/recipes-bsp/grub/grub_2.00.bb
index d4df676..94b6da9 100644
--- a/meta/recipes-bsp/grub/grub_2.00.bb
+++ b/meta/recipes-bsp/grub/grub_2.00.bb
@@ -25,6 +25,7 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \
25 file://fix-endianness-problem.patch \ 25 file://fix-endianness-problem.patch \
26 file://grub2-remove-sparc64-setup-from-x86-builds.patch \ 26 file://grub2-remove-sparc64-setup-from-x86-builds.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
30SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c" 31SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c"