dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

Blame SOURCES/0185-Fix-security-issue-when-reading-username-and-passwor.patch

4fe85b
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
4fe85b
From: Hector Marco-Gisbert <hecmargi@upv.es>
4fe85b
Date: Fri, 13 Nov 2015 16:21:09 +0100
4fe85b
Subject: [PATCH] Fix security issue when reading username and password
4fe85b
4fe85b
  This patch fixes two integer underflows at:
4fe85b
    * grub-core/lib/crypto.c
4fe85b
    * grub-core/normal/auth.c
4fe85b
4fe85b
Resolves: CVE-2015-8370
4fe85b
4fe85b
Signed-off-by: Hector Marco-Gisbert <hecmargi@upv.es>
4fe85b
Signed-off-by: Ismael Ripoll-Ripoll <iripoll@disca.upv.es>
4fe85b
---
4fe85b
 grub-core/lib/crypto.c  | 2 +-
4fe85b
 grub-core/normal/auth.c | 2 +-
4fe85b
 2 files changed, 2 insertions(+), 2 deletions(-)
4fe85b
4fe85b
diff --git a/grub-core/lib/crypto.c b/grub-core/lib/crypto.c
4fe85b
index 8e8426c4ab4..a23519cb3bd 100644
4fe85b
--- a/grub-core/lib/crypto.c
4fe85b
+++ b/grub-core/lib/crypto.c
4fe85b
@@ -456,7 +456,7 @@ grub_password_get (char buf[], unsigned buf_size)
4fe85b
 	  break;
4fe85b
 	}
4fe85b
 
4fe85b
-      if (key == '\b')
4fe85b
+      if (key == '\b' && cur_len)
4fe85b
 	{
4fe85b
 	  cur_len--;
4fe85b
 	  continue;
4fe85b
diff --git a/grub-core/normal/auth.c b/grub-core/normal/auth.c
4fe85b
index c6bd96e28ec..5782ec5a940 100644
4fe85b
--- a/grub-core/normal/auth.c
4fe85b
+++ b/grub-core/normal/auth.c
4fe85b
@@ -172,7 +172,7 @@ grub_username_get (char buf[], unsigned buf_size)
4fe85b
 	  break;
4fe85b
 	}
4fe85b
 
4fe85b
-      if (key == '\b')
4fe85b
+      if (key == '\b' && cur_len)
4fe85b
 	{
4fe85b
 	  cur_len--;
4fe85b
 	  grub_printf ("\b");