summaryrefslogtreecommitdiff
path: root/sys-boot/grub/files/CVE-2015-8370.patch
diff options
context:
space:
mode:
authorV3n3RiX <venerix@rogentos.ro>2016-03-24 10:02:04 +0000
committerV3n3RiX <venerix@rogentos.ro>2016-03-24 10:02:04 +0000
commit0ee1b38bf6cd303d09003b08fdfd50876d394d5b (patch)
treef1203508990b84338122590555432b3123c3b81b /sys-boot/grub/files/CVE-2015-8370.patch
parentd3b9de9e515a63d6b780435704aa2d1430b36ad5 (diff)
import grub from gentoo
Diffstat (limited to 'sys-boot/grub/files/CVE-2015-8370.patch')
-rw-r--r--sys-boot/grub/files/CVE-2015-8370.patch54
1 files changed, 54 insertions, 0 deletions
diff --git a/sys-boot/grub/files/CVE-2015-8370.patch b/sys-boot/grub/files/CVE-2015-8370.patch
new file mode 100644
index 00000000..69e419ee
--- /dev/null
+++ b/sys-boot/grub/files/CVE-2015-8370.patch
@@ -0,0 +1,54 @@
+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>
+---
+ grub-core/lib/crypto.c | 3 ++-
+ grub-core/normal/auth.c | 7 +++++--
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/grub-core/lib/crypto.c b/grub-core/lib/crypto.c
+index 010e550..683a8aa 100644
+--- a/grub-core/lib/crypto.c
++++ b/grub-core/lib/crypto.c
+@@ -470,7 +470,8 @@ grub_password_get (char buf[], unsigned buf_size)
+
+ if (key == '\b')
+ {
+- cur_len--;
++ if (cur_len)
++ cur_len--;
+ continue;
+ }
+
+diff --git a/grub-core/normal/auth.c b/grub-core/normal/auth.c
+index c6bd96e..8615c48 100644
+--- a/grub-core/normal/auth.c
++++ b/grub-core/normal/auth.c
+@@ -174,8 +174,11 @@ grub_username_get (char buf[], unsigned buf_size)
+
+ if (key == '\b')
+ {
+- cur_len--;
+- grub_printf ("\b");
++ if (cur_len)
++ {
++ cur_len--;
++ grub_printf ("\b");
++ }
+ continue;
+ }
+
+--
+2.6.4
+