Bug#807614: grub2: CVE-2015-8370: buffer overflow when checking password entered during bootup

[Salvatore Bonaccorso]

Control: tags -1 + patch

Hi

Attached is proposed debdiff for the unstable version.

Regards,
Salvatore
-------------- next part --------------
diff -Nru grub2-2.02~beta2/debian/changelog grub2-2.02~beta2/debian/changelog
--- grub2-2.02~beta2/debian/changelog	2015-11-25 17:07:34.000000000 +0100
+++ grub2-2.02~beta2/debian/changelog	2015-12-16 11:09:56.000000000 +0100
@@ -1,3 +1,12 @@
+grub2 (2.02~beta2-32.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Add Fix-CVE-2015-8370-Grub2-user-pass-vulnerability.patch patch.
+    CVE-2015-8370: buffer overflow when checking password entered during
+    bootup. (Closes: #807614)
+
+ -- Salvatore Bonaccorso <carnil at debian.org>  Wed, 16 Dec 2015 11:09:18 +0100
+
 grub2 (2.02~beta2-32) unstable; urgency=medium
 
   [ Mathieu Trudel-Lapierre ]
diff -Nru grub2-2.02~beta2/debian/patches/Fix-CVE-2015-8370-Grub2-user-pass-vulnerability.patch grub2-2.02~beta2/debian/patches/Fix-CVE-2015-8370-Grub2-user-pass-vulnerability.patch
--- grub2-2.02~beta2/debian/patches/Fix-CVE-2015-8370-Grub2-user-pass-vulnerability.patch	1970-01-01 01:00:00.000000000 +0100
+++ grub2-2.02~beta2/debian/patches/Fix-CVE-2015-8370-Grub2-user-pass-vulnerability.patch	2015-12-16 11:09:56.000000000 +0100
@@ -0,0 +1,45 @@
+From 88c9657960a6c5d3673a25c266781e876c181add Mon Sep 17 00:00:00 2001
+From: Hector Marco-Gisbert <hecmargi at upv.es>
+Date: Fri, 13 Nov 2015 16:21:09 +0100
+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
+
+Signed-off-by: Hector Marco-Gisbert <hecmargi at upv.es>
+Signed-off-by: Ismael Ripoll-Ripoll <iripoll at disca.upv.es>
+---
+ grub-core/lib/crypto.c  | 2 +-
+ grub-core/normal/auth.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/grub-core/lib/crypto.c b/grub-core/lib/crypto.c
+index 010e550..524a3d8 100644
+--- a/grub-core/lib/crypto.c
++++ b/grub-core/lib/crypto.c
+@@ -456,7 +456,7 @@ grub_password_get (char buf[], unsigned
+ 	  break;
+ 	}
+ 
+-      if (key == '\b')
++      if (key == '\b' && cur_len)
+ 	{
+ 	  cur_len--;
+ 	  continue;
+diff --git a/grub-core/normal/auth.c b/grub-core/normal/auth.c
+index c6bd96e..5782ec5 100644
+--- a/grub-core/normal/auth.c
++++ b/grub-core/normal/auth.c
+@@ -172,7 +172,7 @@ grub_username_get (char buf[], unsigned
+ 	  break;
+ 	}
+ 
+-      if (key == '\b')
++      if (key == '\b' && cur_len)
+ 	{
+ 	  cur_len--;
+ 	  grub_printf ("\b");
+-- 
+1.9.1
+
diff -Nru grub2-2.02~beta2/debian/patches/series grub2-2.02~beta2/debian/patches/series
--- grub2-2.02~beta2/debian/patches/series	2015-11-25 17:04:46.000000000 +0100
+++ grub2-2.02~beta2/debian/patches/series	2015-12-16 11:09:56.000000000 +0100
@@ -83,3 +83,4 @@
 xfs-crc-fix-symlink.patch
 ofdisk_add_sas_disks.patch
 efinet-open-Simple-Network-Protocol-exclusively.patch
+Fix-CVE-2015-8370-Grub2-user-pass-vulnerability.patch