dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

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

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